diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 04:25:16 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 04:25:16 +0000 |
| commit | 454da65a84f777a79703d7344395494ee2810e59 (patch) | |
| tree | 87850c99fd4d79d9455cd03ff5f29865829e6f6b | |
| parent | 807f55ecb7ece39b25866405125d7e58b4bad9f2 (diff) | |
| download | chromium_src-454da65a84f777a79703d7344395494ee2810e59.zip chromium_src-454da65a84f777a79703d7344395494ee2810e59.tar.gz chromium_src-454da65a84f777a79703d7344395494ee2810e59.tar.bz2 | |
Clean up mojo export files.
While I was looking at these files I noticed the GFX_IMPLEMENTATION,
which triggered me to make these cleanups.
BUG=None
TEST=None
TBR=darin@chromium.org
Review URL: https://codereview.chromium.org/110843003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240009 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | mojo/common/mojo_common_export.h | 8 | ||||
| -rw-r--r-- | mojo/public/gles2/gles2.h | 17 | ||||
| -rw-r--r-- | mojo/public/system/system_export.h | 8 |
3 files changed, 18 insertions, 15 deletions
diff --git a/mojo/common/mojo_common_export.h b/mojo/common/mojo_common_export.h index 3563477..48d21d0 100644 --- a/mojo/common/mojo_common_export.h +++ b/mojo/common/mojo_common_export.h @@ -15,7 +15,7 @@ #define MOJO_COMMON_EXPORT __declspec(dllimport) #endif -#else // defined(WIN32) +#else // !defined(WIN32) #if defined(MOJO_COMMON_IMPLEMENTATION) #define MOJO_COMMON_EXPORT __attribute__((visibility("default"))) @@ -25,10 +25,8 @@ #endif // defined(WIN32) -#else // defined(COMPONENT_BUILD) - +#else // !defined(COMPONENT_BUILD) #define MOJO_COMMON_EXPORT - -#endif // defined(COMPONENT_BUILD) +#endif #endif // MOJO_COMMON_MOJO_COMMON_EXPORT_H_ diff --git a/mojo/public/gles2/gles2.h b/mojo/public/gles2/gles2.h index 36af768..fbcb2c7 100644 --- a/mojo/public/gles2/gles2.h +++ b/mojo/public/gles2/gles2.h @@ -2,31 +2,34 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_PUBLIC_GLES2_ADAPTOR_H_ -#define MOJO_PUBLIC_GLES2_ADAPTOR_H_ +#ifndef MOJO_PUBLIC_GLES2_GLES2_H_ +#define MOJO_PUBLIC_GLES2_GLES2_H_ // Note: This header should be compilable as C. #include <stdint.h> #if defined(COMPONENT_BUILD) + #if defined(WIN32) #if defined(MOJO_GLES2_IMPLEMENTATION) #define MOJO_GLES2_EXPORT __declspec(dllexport) #else #define MOJO_GLES2_EXPORT __declspec(dllimport) -#endif // defined(MOJO_GLES2_IMPLEMENTATION) +#endif + +#else // !defined(WIN32) -#else // defined(WIN32) #if defined(MOJO_GLES2_IMPLEMENTATION) #define MOJO_GLES2_EXPORT __attribute__((visibility("default"))) #else #define MOJO_GLES2_EXPORT #endif -#endif -#else // defined(COMPONENT_BUILD) +#endif // defined(WIN32) + +#else // !defined(COMPONENT_BUILD) #define MOJO_GLES2_EXPORT #endif @@ -44,4 +47,4 @@ MOJO_GLES2_EXPORT void MojoGLES2SwapBuffers(); } // extern "C" #endif -#endif // MOJO_PUBLIC_GLES2_ADAPTOR_H_ +#endif // MOJO_PUBLIC_GLES2_GLES2_H_ diff --git a/mojo/public/system/system_export.h b/mojo/public/system/system_export.h index 3a7035b..6b563ff 100644 --- a/mojo/public/system/system_export.h +++ b/mojo/public/system/system_export.h @@ -11,14 +11,16 @@ #define MOJO_SYSTEM_EXPORT __declspec(dllexport) #else #define MOJO_SYSTEM_EXPORT __declspec(dllimport) -#endif // defined(GFX_IMPLEMENTATION) +#endif + +#else // !defined(WIN32) -#else // defined(WIN32) #if defined(MOJO_SYSTEM_IMPLEMENTATION) #define MOJO_SYSTEM_EXPORT __attribute__((visibility("default"))) #else #define MOJO_SYSTEM_EXPORT #endif -#endif + +#endif // defined(WIN32) #endif // MOJO_PUBLIC_SYSTEM_SYSTEM_EXPORT_H_ |