Bug 940708 - Code changes required to build webrtc in unified mode; r=jesup

media/webrtc/signaling/src/sipcc/core/ccapp/cc_device_manager.h

@@ -2,6 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#ifndef __CC_DEVICE_MANAGER_H__
+#define __CC_DEVICE_MANAGER_H__
+
 /**
  * Management Events
  */
@@ -41,3 +44,5 @@ MGMT_STATE_DESTROY_AWAIT_SHUTDOWN_ACK
 
 extern void registration_processEvent(int event);
 cc_boolean is_phone_registered();
+
+#endif

media/webrtc/signaling/src/sipcc/core/ccapp/sessionHash.h

@@ -2,6 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#ifndef __SESSIONHASH_H__
+#define __SESSIONHASH_H__
+
 typedef struct hash_table {
    struct hash_table *next;
    struct hash_table *prev;
@@ -21,3 +24,5 @@ extern int addhash (unsigned int key, void *data) ;
 extern int delhash(unsigned int  key);
 extern void *findhash(unsigned int key);
 extern unsigned int ccpro_get_sessionId_by_callid(unsigned short call_id);
+
+#endif

media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h

@@ -8,6 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_FORWARD_ERROR_CORRECTION_INTERNAL_H_
+#define WEBRTC_MODULES_RTP_RTCP_SOURCE_FORWARD_ERROR_CORRECTION_INTERNAL_H_
+
 #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
 #include "webrtc/typedefs.h"
 
@@ -64,3 +67,5 @@ void GeneratePacketMasks(int num_media_packets, int num_fec_packets,
 
 }  // namespace internal
 }  // namespace webrtc
+
+#endif

media/webrtc/trunk/webrtc/voice_engine/transmit_mixer.h

@@ -241,8 +241,8 @@ private:
     bool swap_stereo_channels_;
 };
 
-#endif // WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H
-
 }  // namespace voe
 
 }  // namespace webrtc
+
+#endif // WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H