Revision 372c2c31

View differences:

ml.c
177 177
/*
178 178
 * helper function to get rid of a warning
179 179
 */
180
#ifndef WIN32
180
#ifndef _WIN32
181 181
int min(int a, int b) {
182 182
	if (a > b) return b;
183 183
	return a;
ml_all.h
10 10
#include <assert.h>
11 11
#include <errno.h>
12 12

  
13
#ifndef WIN32
13
#ifndef _WIN32
14 14
#include <arpa/inet.h>
15 15
#include <netdb.h>
16 16
#include <netinet/in.h>
stun_server/stund/stun.h
17 17
typedef unsigned char  UInt8;
18 18
typedef unsigned short UInt16;
19 19
typedef unsigned int   UInt32;
20
#if defined( WIN32 )
20
#if defined( _WIN32 )
21 21
typedef unsigned __int64 UInt64;
22 22
#else
23 23
typedef unsigned long long UInt64;
......
195 195
   StunTypeFirewall,
196 196
} NatType;
197 197

  
198
#ifdef WIN32
198
#ifdef _WIN32
199 199
typedef SOCKET Socket;
200 200
#else
201 201
typedef int Socket;
stun_server/stund/udp.h
8 8

  
9 9
#include <errno.h>
10 10

  
11
#ifdef WIN32
11
#ifdef _WIN32
12 12

  
13 13
#include <winsock2.h>
14 14
#include <io.h>
transmissionHandler.h
46 46
#ifndef TRANSMISSIONHANDLER_H
47 47
#define TRANSMISSIONHANDLER_H
48 48
#include <sys/time.h>
49
#ifndef WIN32
49
#ifndef _WIN32
50 50
#include <netinet/in.h>
51 51
#include <sys/socket.h>
52 52
#include <arpa/inet.h>
......
59 59
#include "util/stun.h"
60 60
#include "ml.h"
61 61

  
62
#ifndef WIN32
62
#ifndef _WIN32
63 63
#ifndef boolean
64 64
typedef bool boolean;
65 65
#endif
util/queueManagement.h
13 13

  
14 14
#include <unistd.h>
15 15

  
16
#ifndef WIN32
16
#ifndef _WIN32
17 17
#include <netinet/in.h>
18 18
#else
19 19
#include <winsock2.h>
util/stun.c
46 46

  
47 47
#include <fcntl.h>
48 48

  
49
#ifndef WIN32
49
#ifndef _WIN32
50 50
#include <sys/ioctl.h>
51 51
#include <sys/socket.h>
52 52
#include <netdb.h>
......
679 679
#     error Need some way to seed the random number generator 
680 680
#endif 
681 681
      int seed = (int)(tick);
682
#ifdef WIN32
682
#ifdef _WIN32
683 683
      srand(seed);
684 684
#else
685 685
      srandom(seed);
......
696 696
stunGetSystemTimeSecs()
697 697
{
698 698
   UInt64 time=0;
699
#if defined(WIN32)  
699
#if defined(_WIN32)  
700 700
   SYSTEMTIME t;
701 701
   // CJ TODO - this probably has bug on wrap around every 24 hours
702 702
   GetSystemTime( &t );
util/stun.h
50 50

  
51 51
#include <stdio.h> 
52 52
#include <time.h>
53
#ifndef WIN32
53
#ifndef _WIN32
54 54
#include <netinet/in.h>
55 55
#endif
56 56
#include <string.h>
util/udpSocket.c
136 136

  
137 137
}
138 138

  
139
#ifndef WIN32
139
#ifndef _WIN32
140 140
/* Information: read the standard TTL from a socket  */
141 141
int getTTL(const int udpSocket,uint8_t *ttl){
142 142
#ifdef MAC_OS
util/udpSocket.h
55 55
#include <event2/event.h>
56 56
#include <time.h>
57 57

  
58
#ifndef WIN32
58
#ifndef _WIN32
59 59
#include <arpa/inet.h>
60 60
#include <netdb.h>
61 61
#include <netinet/in.h>

Also available in: Unified diff