Bug 798926 - Define INTEGER_TYPES_H and others for srtp.h. r=jesup
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 17 Oct 2012 16:28:33 +0200
changeset 110670 cbaae9a05b62629d0714a9a0912948be4ef391bf
parent 110669 daf391b98703475dbda9aead34a7e5ebc16c0a1c
child 110671 bc2385c28209fef74831df072c10098625794cd8
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
reviewersjesup
bugs798926
milestone19.0a1
Bug 798926 - Define INTEGER_TYPES_H and others for srtp.h. r=jesup
media/webrtc/signaling/signaling.gyp
netwerk/srtp/src/Makefile.in
--- a/media/webrtc/signaling/signaling.gyp
+++ b/media/webrtc/signaling/signaling.gyp
@@ -148,16 +148,22 @@
       'defines' : [
         'LOG4CXX_STATIC', 
         '_NO_LOG4CXX', 
         'USE_SSLEAY', 
         '_CPR_USE_EXTERNAL_LOGGER',
         'WEBRTC_RELATIVE_PATH',
       	'HAVE_WEBRTC_VIDEO',
         'HAVE_WEBRTC_VOICE',
+        'HAVE_STDLIB_H=1',
+        'INTEGER_TYPES_H="\\"mozilla/StandardInteger.h\\""',
+        'HAVE_UINT8_T=1',
+        'HAVE_UINT16_T=1',
+        'HAVE_UINT32_T=1',
+        'HAVE_UINT64_T=1',
       ],
 
       #
       # Conditionals
       #
       'conditions': [
         ['build_for_test==0', {
           'defines' : [
--- a/netwerk/srtp/src/Makefile.in
+++ b/netwerk/srtp/src/Makefile.in
@@ -62,17 +62,16 @@ CSRCS := \
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/include \
   -I$(srcdir)/crypto/include \
   $(NULL)
 
 DEFINES += \
   -DHAVE_STDLIB_H=1 \
-  -DHAVE_STRING_H=1 \
   -DINTEGER_TYPES_H="\"mozilla/StandardInteger.h\"" \
   -DHAVE_UINT8_T=1 \
   -DHAVE_UINT16_T=1 \
   -DHAVE_UINT32_T=1 \
   -DHAVE_UINT64_T=1 \
   $(NULL)
 
 # We know StandardInteger.h will define uint8/16/32/64_t, so we don't need