summaryrefslogtreecommitdiffstats
path: root/gpu/demos/framework
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-02 18:37:51 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-02 18:37:51 +0000
commit23f77116cafe9a88819b60c7606453ae0db8f35d (patch)
treeaacf7537fca0c887449f46980b992bf26f107d38 /gpu/demos/framework
parentef42e30fbfcd6db1c2a5ed77818db2329b5bd1a8 (diff)
downloadchromium_src-23f77116cafe9a88819b60c7606453ae0db8f35d.zip
chromium_src-23f77116cafe9a88819b60c7606453ae0db8f35d.tar.gz
chromium_src-23f77116cafe9a88819b60c7606453ae0db8f35d.tar.bz2
More POSIX support for Chromium, consisting mostly of broadening ifdefs. This
patch cuts across modules, as there's only a handful necessary for each, with the most in chrome/test/. ALSA is enabled on FreeBSD and Solaris, as libasound has been ported to those two platforms, and I moved resolv.h in host_resolver_proc.cc, because it depends on headers from sys_addrinfo.h on FreeBSD. Patch by ruben (chromium@hybridsource.org) Review URL: http://codereview.chromium.org/6976055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87641 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/demos/framework')
-rw-r--r--gpu/demos/framework/main_exe.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/gpu/demos/framework/main_exe.cc b/gpu/demos/framework/main_exe.cc
index 0c54804..296d164 100644
--- a/gpu/demos/framework/main_exe.cc
+++ b/gpu/demos/framework/main_exe.cc
@@ -8,9 +8,9 @@
#include "gpu/demos/framework/window.h"
#include "ui/gfx/gl/gl_surface.h"
-#if defined(OS_LINUX)
+#if defined(TOOLKIT_USES_GTK)
#include <gtk/gtk.h>
-#endif // OS_LINUX
+#endif // TOOLKIT_USES_GTK
namespace {
static const int kWindowWidth = 512;
@@ -18,9 +18,9 @@ static const int kWindowHeight = 512;
} // namespace.
int main(int argc, char** argv) {
-#if defined(OS_LINUX)
+#if defined(TOOLKIT_USES_GTK)
gtk_init(&argc, &argv);
-#endif // OS_LINUX
+#endif // TOOLKIT_USES_GTK
// AtExitManager is used by singleton classes to delete themselves when
// the program terminates.