Eliminate defines in talk/

talk/media/devices/videorendererfactory.h

 /*
  * libjingle
  * Copyright 2010 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 14 matching lines @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 //
 // A factory to create a GUI video renderer.
 
 #ifndef TALK_MEDIA_DEVICES_VIDEORENDERERFACTORY_H_
 #define TALK_MEDIA_DEVICES_VIDEORENDERERFACTORY_H_
 
 #include "talk/media/base/videorenderer.h"
-#if defined(LINUX) && defined(HAVE_GTK)
+#if defined(WEBRTC_LINUX) && defined(HAVE_GTK)
 #include "talk/media/devices/gtkvideorenderer.h"
-#elif defined(OSX) && !defined(CARBON_DEPRECATED)
+#elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) && !defined(CARBON_DEPRECATED)
 #include "talk/media/devices/carbonvideorenderer.h"
 #elif defined(WIN32)
 #include "talk/media/devices/gdivideorenderer.h"
 #endif
 
 namespace cricket {
 
 class VideoRendererFactory {
  public:
   static VideoRenderer* CreateGuiVideoRenderer(int x, int y) {
-  #if defined(LINUX) && defined(HAVE_GTK)
+  #if defined(WEBRTC_LINUX) && defined(HAVE_GTK)
     return new GtkVideoRenderer(x, y);
-  #elif defined(OSX) && !defined(CARBON_DEPRECATED)
+  #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) && \
+      !defined(CARBON_DEPRECATED)
     CarbonVideoRenderer* renderer = new CarbonVideoRenderer(x, y);
     // Needs to be initialized on the main thread.
     if (renderer->Initialize()) {
       return renderer;
     } else {
       delete renderer;
       return NULL;
     }
   #elif defined(WIN32)
     return new GdiVideoRenderer(x, y);
   #else
     return NULL;
   #endif
   }
 };
 
 }  // namespace cricket
 
 #endif  // TALK_MEDIA_DEVICES_VIDEORENDERERFACTORY_H_