From 23f77116cafe9a88819b60c7606453ae0db8f35d Mon Sep 17 00:00:00 2001 From: "tony@chromium.org" Date: Thu, 2 Jun 2011 18:37:51 +0000 Subject: 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 --- gpu/gles2_conform_support/gles2_conform_support.gyp | 4 ++-- gpu/gles2_conform_support/native/main.cc | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gpu/gles2_conform_support') diff --git a/gpu/gles2_conform_support/gles2_conform_support.gyp b/gpu/gles2_conform_support/gles2_conform_support.gyp index 45737d4..d0ed80a 100644 --- a/gpu/gles2_conform_support/gles2_conform_support.gyp +++ b/gpu/gles2_conform_support/gles2_conform_support.gyp @@ -54,7 +54,7 @@ 'egl_native', ], 'conditions': [ - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': ['../../build/linux/system.gyp:gtk'], }], ], @@ -76,7 +76,7 @@ '<(DEPTH)/third_party/expat/expat.gyp:expat', ], 'conditions': [ - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': ['../../build/linux/system.gyp:gtk'], }], ], diff --git a/gpu/gles2_conform_support/native/main.cc b/gpu/gles2_conform_support/native/main.cc index 032318cf..fd3dc75 100644 --- a/gpu/gles2_conform_support/native/main.cc +++ b/gpu/gles2_conform_support/native/main.cc @@ -5,9 +5,9 @@ #include "base/at_exit.h" #include "base/message_loop.h" -#if defined(OS_LINUX) +#if defined(TOOLKIT_USES_GTK) #include -#endif // OS_LINUX +#endif extern "C" { #if defined(GLES2_CONFORM_SUPPORT_ONLY) @@ -18,9 +18,9 @@ extern "C" { } int main(int argc, char *argv[]) { -#if defined(OS_LINUX) +#if defined(TOOLKIT_USES_GTK) gtk_init(&argc, &argv); -#endif // OS_LINUX +#endif base::AtExitManager at_exit; MessageLoopForUI message_loop; -- cgit v1.1