Bug 1341285 - Add missing BSD bits lost during the rebase. r=jesup

media/webrtc/signaling/signaling.gyp

@@ -291,6 +291,12 @@
             'USE_FAKE_PCOBSERVER',
           ],
         }],
+        # See webrtc/base/task_queue.h
+        ['OS!="mac" and OS!="ios" and OS!="win"', {
+          'defines': [
+            'WEBRTC_BUILD_LIBEVENT',
+          ],
+        }],
         ['(OS=="linux") or (OS=="android")', {
           'include_dirs': [
           ],
@@ -303,7 +309,6 @@
             'LINUX',
             'GIPS_VER=3510',
             'SECLIB_OPENSSL',
-            'WEBRTC_BUILD_LIBEVENT',
           ],
 
           'cflags_mozilla': [

media/webrtc/trunk/webrtc/base/base.gyp

@@ -226,7 +226,7 @@
                     '<(libevent_dir)/linux/',
                   ],
                 }],
-                ['OS=="bsd"', {
+                ['os_bsd==1', {
                   'include_dirs': [
                     '<(libevent_dir)/bsd/',
                   ],

media/webrtc/trunk/webrtc/build/common.gypi

@@ -442,13 +442,6 @@
       ['os_bsd==1', {
         'defines': [
           'WEBRTC_BSD',
-          'WEBRTC_THREAD_RR',
-        ],
-      }],
-      ['OS=="dragonfly" or OS=="netbsd"', {
-        'defines': [
-          # doesn't support pthread_condattr_setclock
-          'WEBRTC_CLOCK_TYPE_REALTIME',
         ],
       }],
       ['OS=="openbsd"', {
@@ -580,17 +573,7 @@
       }],
       ['os_bsd==1', {
         'defines': [
-          'BSD',
-        ],
-      }],
-      ['OS=="openbsd"', {
-        'defines': [
-          'OPENBSD',
-        ],
-      }],
-      ['OS=="freebsd"', {
-        'defines': [
-          'FREEBSD',
+          'WEBRTC_BSD',
         ],
       }],
       ['include_internal_audio_device==1', {
@@ -678,17 +661,7 @@
         }],
         ['os_bsd==1', {
           'defines': [
-            'BSD',
-          ],
-        }],
-        ['OS=="openbsd"', {
-          'defines': [
-            'OPENBSD',
-          ],
-        }],
-        ['OS=="freebsd"', {
-          'defines': [
-            'FREEBSD',
+            'WEBRTC_BSD',
           ],
         }],
       ],

media/webrtc/trunk/webrtc/build/filename_rules.gypi

@@ -31,7 +31,7 @@
     # In case a file is not needed, it is going to be excluded later on.
     # TODO(evan): the above is not correct; we shouldn't build _linux
     # files on non-linux.
-    ['OS!="linux" and OS!="openbsd" and OS!="freebsd" or >(nacl_untrusted_build)==1', {
+    ['OS!="linux" and OS!="solaris" and <(os_bsd)!=1 or >(nacl_untrusted_build)==1', {
       'sources/': [
         ['exclude', '_linux(_unittest|_test)?\\.(h|cc)$'],
         ['exclude', '(^|/)linux/'],
@@ -60,7 +60,7 @@
         ['exclude', '_nacl(_unittest)?\\.(h|cc)$'],
       ],
     }],
-    ['OS!="linux" and OS!="openbsd" and OS!="freebsd" or >(nacl_untrusted_build)==1', {
+    ['OS!="linux" and OS!="solaris" and <(os_bsd)!=1 or >(nacl_untrusted_build)==1', {
       'sources/': [
         ['exclude', '_xdg(_unittest)?\\.(h|cc)$'],
       ],

media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_types.h

@@ -11,6 +11,9 @@
 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_TYPES_H_
 #define WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_TYPES_H_
 
+#ifndef XP_WIN
+#include <sys/types.h> // pid_t
+#endif
 #include <stdint.h>
 
 #include "webrtc/typedefs.h"

media/webrtc/trunk/webrtc/system_wrappers/system_wrappers.gyp

@@ -137,7 +137,12 @@
             'libraries': [ '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework', ],
           },
         }],
-        ['OS=="linux" or OS=="android"', {
+        ['os_bsd==1', {
+          'defines': [
+            'WEBRTC_THREAD_RR',
+          ],
+        }],
+        ['OS=="linux" or OS=="android" or os_bsd==1', {
           'sources': [
             'source/atomic32_non_darwin_unix.cc',
           ],