summaryrefslogtreecommitdiffstats
path: root/base/debug
diff options
context:
space:
mode:
authorchromium@hybridsource.org <chromium@hybridsource.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-25 04:54:41 +0000
committerchromium@hybridsource.org <chromium@hybridsource.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-25 04:54:41 +0000
commit94f8c957011e0d1f9a28607a05066edc2989eaa2 (patch)
tree0eab7b490ecb89c4e87bfe2da00579c09bd6c2bf /base/debug
parent9a039aead5c77431a21db52692970a0d3e63f1fc (diff)
downloadchromium_src-94f8c957011e0d1f9a28607a05066edc2989eaa2.zip
chromium_src-94f8c957011e0d1f9a28607a05066edc2989eaa2.tar.gz
chromium_src-94f8c957011e0d1f9a28607a05066edc2989eaa2.tar.bz2
Patch for Solaris support, mostly ifdefs and header files, plus adds libevent configuration.
BUG=30101 TEST=compiles Review URL: http://codereview.chromium.org/7238021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90494 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/debug')
-rw-r--r--base/debug/debugger_posix.cc9
-rw-r--r--base/debug/stack_trace_posix.cc1
2 files changed, 5 insertions, 5 deletions
diff --git a/base/debug/debugger_posix.cc b/base/debug/debugger_posix.cc
index bf90a0f..a1551a3 100644
--- a/base/debug/debugger_posix.cc
+++ b/base/debug/debugger_posix.cc
@@ -12,9 +12,6 @@
#include <stdlib.h>
#include <sys/param.h>
#include <sys/stat.h>
-#if !defined(OS_NACL)
-#include <sys/sysctl.h>
-#endif
#include <sys/types.h>
#include <unistd.h>
@@ -29,6 +26,10 @@
#include <AvailabilityMacros.h>
#endif
+#if defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_FREEBSD)
+#include <sys/sysctl.h>
+#endif
+
#include <iostream>
#include "base/basictypes.h"
@@ -136,7 +137,7 @@ bool BeingDebugged() {
return false;
}
-#elif defined(OS_FREEBSD)
+#else
bool BeingDebugged() {
// TODO(benl): can we determine this under FreeBSD?
diff --git a/base/debug/stack_trace_posix.cc b/base/debug/stack_trace_posix.cc
index c405aa2..75dd10d 100644
--- a/base/debug/stack_trace_posix.cc
+++ b/base/debug/stack_trace_posix.cc
@@ -11,7 +11,6 @@
#include <stdlib.h>
#include <sys/param.h>
#include <sys/stat.h>
-#include <sys/sysctl.h>
#include <sys/types.h>
#include <unistd.h>