diff options
| author | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-22 23:44:45 +0000 |
|---|---|---|
| committer | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-22 23:44:45 +0000 |
| commit | 7357497e61bbbaa6c55de4070e03e0bcac74a852 (patch) | |
| tree | b98fd749a14db087b7113c9e9804e9c58534eeb4 /o3d | |
| parent | 5cd6129b7aa7171366134e0d84172f5f884c6d17 (diff) | |
| download | chromium_src-7357497e61bbbaa6c55de4070e03e0bcac74a852.zip chromium_src-7357497e61bbbaa6c55de4070e03e0bcac74a852.tar.gz chromium_src-7357497e61bbbaa6c55de4070e03e0bcac74a852.tar.bz2 | |
fixed include order issues for osx I introduced
with last change.
Review URL: http://codereview.chromium.org/327002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29838 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/plugin/cross/main.h | 12 | ||||
| -rw-r--r-- | o3d/plugin/mac/plugin_mac.mm | 1 |
2 files changed, 8 insertions, 5 deletions
diff --git a/o3d/plugin/cross/main.h b/o3d/plugin/cross/main.h index 5d77d59..08455fe 100644 --- a/o3d/plugin/cross/main.h +++ b/o3d/plugin/cross/main.h @@ -37,24 +37,26 @@ #ifndef O3D_PLUGIN_CROSS_MAIN_H_ #define O3D_PLUGIN_CROSS_MAIN_H_ +#include <GL/glew.h> +#include "core/cross/renderer_platform.h" + #include <npupp.h> #include <stdio.h> #include <fstream> #include <iostream> -#if !defined(O3D_INTERNAL_PLUGIN) -#include "breakpad/win/exception_handler_win32.h" -#endif // O3D_INTERNAL_PLUGIN - #include "core/cross/renderer.h" -#include "core/cross/renderer_platform.h" #include "plugin/cross/o3d_glue.h" #include "plugin/cross/config.h" #include "plugin/cross/stream_manager.h" #include "third_party/nixysa/static_glue/npapi/common.h" #include "third_party/nixysa/static_glue/npapi/npn_api.h" +#if !defined(O3D_INTERNAL_PLUGIN) +#include "breakpad/win/exception_handler_win32.h" +#endif // O3D_INTERNAL_PLUGIN + #if defined(OS_LINUX) #define EXPORT_SYMBOL __attribute__((visibility ("default"))) #else diff --git a/o3d/plugin/mac/plugin_mac.mm b/o3d/plugin/mac/plugin_mac.mm index a0d3396..7b89b32 100644 --- a/o3d/plugin/mac/plugin_mac.mm +++ b/o3d/plugin/mac/plugin_mac.mm @@ -31,6 +31,7 @@ +#include <GL/glew.h> #include "plugin_mac.h" #include "Breakpad.h" #include <Cocoa/Cocoa.h> |