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

Review URL: http://codereview.chromium.org/495002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35321 0039d316-1c4b-4281-b951-d872f2087c98


CrOS-Libchrome-Original-Commit: e43eddf1a5887c4b249af3daa024c1107ce254a1
diff --git a/base/sys_info_posix.cc b/base/sys_info_posix.cc
index af33331..b2526ba 100644
--- a/base/sys_info_posix.cc
+++ b/base/sys_info_posix.cc
@@ -6,7 +6,9 @@
 
 #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>
 
@@ -14,11 +16,6 @@
 #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"