Changes to base/ from a combination of FreeBSD and OpenBSD patches.

base/sys_info_posix.cc

 // Copyright (c) 2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/sys_info.h"
 
 #include <errno.h>
 #include <string.h>
+#include <sys/param.h>
 #include <sys/statvfs.h>
+#include <sys/sysctl.h>
 #include <sys/utsname.h>
 #include <unistd.h>
 
 #if !defined(OS_MACOSX)
 #include <gdk/gdk.h>
 #endif
 
-#if defined(OS_OPENBSD)
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#endif
-
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 
 namespace base {
 
 #if !defined(OS_OPENBSD)
 int SysInfo::NumberOfProcessors() {
   // It seems that sysconf returns the number of "logical" processors on both
@@ skipping 87 matching lines @@
   return gdk_screen_get_n_monitors(screen);
 }
 #endif
 
 // static
 size_t SysInfo::VMAllocationGranularity() {
   return getpagesize();
 }
 
 }  // namespace base