fix for apple

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@735 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

linphone/oRTP/include/ortp/stun.h

@@ -94,7 +94,11 @@ extern "C"
 /* define some basic types */
 typedef unsigned char  UInt8;
 typedef unsigned short UInt16;
-typedef unsigned int   UInt32;
+#if __LP64__
+	typedef unsigned int   UInt32;
+#else
+	typedef unsigned long   UInt32;
+#endif
 #if	defined(WIN32) || defined(_WIN32_WCE)
 typedef unsigned __int64 UInt64;
 #else
@@ -122,7 +126,7 @@ typedef struct { unsigned char octet[12]; }  UInt96;
 #define SA_ERRORCODE         0x0009
 #define SA_UNKNOWNATTRIBUTE  0x000A
 #define SA_REFLECTEDFROM     0x000B /** deprecated **/
-#define SA_REALM             0x0014
+#define SA_REALM             0x0014
 #define SA_NONCE             0x0015
 #define SA_XORMAPPEDADDRESS  0x0020
 
@@ -130,44 +134,44 @@ typedef struct { unsigned char octet[12]; }  UInt96;
 #define SA_XORONLY           0x0021 /* deprecated */
 #define SA_SECONDARYADDRESS  0x0050 /* Non standard extention */
 
-#define SA_SOFTWARE          0x8022
-#define SA_ALTERNATESERVER   0x8023
+#define SA_SOFTWARE          0x8022
+#define SA_ALTERNATESERVER   0x8023
 #define SA_FINGERPRINT       0x8028
 
 /* define turn attribute */
-#define TA_CHANNELNUMBER       0x000C
-#define TA_LIFETIME            0x000D
-#define TA_DEPRECATEDBANDWIDTH 0x0010
-#define TA_XORPEERADDRESS      0x0012
-#define TA_DATA                0x0013
-#define TA_XORRELAYEDADDRESS   0x0016
-#define TA_EVENPORT            0x0018
-#define TA_REQUESTEDTRANSPORT  0x0019
-#define TA_DONTFRAGMENT        0x001A
-#define TA_DEPRECATEDTIMERVAL  0x0021
+#define TA_CHANNELNUMBER       0x000C
+#define TA_LIFETIME            0x000D
+#define TA_DEPRECATEDBANDWIDTH 0x0010
+#define TA_XORPEERADDRESS      0x0012
+#define TA_DATA                0x0013
+#define TA_XORRELAYEDADDRESS   0x0016
+#define TA_EVENPORT            0x0018
+#define TA_REQUESTEDTRANSPORT  0x0019
+#define TA_DONTFRAGMENT        0x001A
+#define TA_DEPRECATEDTIMERVAL  0x0021
 #define TA_RESERVATIONTOKEN    0x0022
 
-#define ICEA_PRIORITY          0x0024
-#define ICEA_USECANDIDATE      0x0025
-#define ICEA_ICECONTROLLED     0x8029
-#define ICEA_ICECONTROLLING    0x802a
+#define ICEA_PRIORITY          0x0024
+#define ICEA_USECANDIDATE      0x0025
+#define ICEA_ICECONTROLLED     0x8029
+#define ICEA_ICECONTROLLING    0x802a
 
 #define STUN_REQUEST           0x0000
 #define STUN_INDICATION        0x0010
 #define STUN_SUCCESS_RESP      0x0100
 #define STUN_ERR_RESP          0x0110
 
-#define STUN_IS_REQUEST(msg_type)       (((msg_type) & 0x0110) == 0x0000)
-#define STUN_IS_INDICATION(msg_type)    (((msg_type) & 0x0110) == 0x0010)
-#define STUN_IS_SUCCESS_RESP(msg_type)  (((msg_type) & 0x0110) == 0x0100)
-#define STUN_IS_ERR_RESP(msg_type)      (((msg_type) & 0x0110) == 0x0110)
+#define STUN_IS_REQUEST(msg_type)       (((msg_type) & 0x0110) == 0x0000)
+#define STUN_IS_INDICATION(msg_type)    (((msg_type) & 0x0110) == 0x0010)
+#define STUN_IS_SUCCESS_RESP(msg_type)  (((msg_type) & 0x0110) == 0x0100)
+#define STUN_IS_ERR_RESP(msg_type)      (((msg_type) & 0x0110) == 0x0110)
 
 /* define types for a stun message */
 #define STUN_METHOD_BINDING           0x0001
-#define TURN_MEDHOD_ALLOCATE          0x0003 //(only request/response semantics defined)
-#define TURN_METHOD_REFRESH           0x0004 //(only request/response semantics defined)
-#define TURN_METHOD_CREATEPERMISSION  0x0008 //(only request/response semantics defined
-#define TURN_METHOD_CHANNELBIND       0x0009 //(only request/response semantics defined)
+#define TURN_MEDHOD_ALLOCATE          0x0003 //(only request/response semantics defined)
+#define TURN_METHOD_REFRESH           0x0004 //(only request/response semantics defined)
+#define TURN_METHOD_CREATEPERMISSION  0x0008 //(only request/response semantics defined
+#define TURN_METHOD_CHANNELBIND       0x0009 //(only request/response semantics defined)
 
 //#define BindResponseMsg               0x0101
 //#define BindErrorResponseMsg          0x0111
@@ -175,8 +179,8 @@ typedef struct { unsigned char octet[12]; }  UInt96;
 #define SharedSecretResponseMsg       0x0102
 #define SharedSecretErrorResponseMsg  0x0112
 
-#define TURN_INDICATION_SEND          0x0006 //(only indication semantics defined)
-#define TURN_INDICATION_DATA          0x0007 //(only indication semantics defined)
+#define TURN_INDICATION_SEND          0x0006 //(only indication semantics defined)
+#define TURN_INDICATION_DATA          0x0007 //(only indication semantics defined)
 
 typedef struct 
 {