summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChia-I Wu <olv@lunarg.com>2010-05-31 11:15:06 +0800
committerChia-I Wu <olv@lunarg.com>2010-05-31 11:31:07 +0800
commitba26631d0d936523c7a8f002cf469e569aa6d7a3 (patch)
tree4099b9c76aa85fd44492817199fd09f867bd5892
parent14f1157a2e52f14149cee7cf87cf3b32c6e439fb (diff)
Define PUBLIC to dllexport on MSVC.
Define PUBLIC to __declspec(dllexport) when _MVC_VER is defined.
-rw-r--r--src/egl/main/eglcompiler.h12
-rw-r--r--src/gallium/include/pipe/p_compiler.h2
-rw-r--r--src/mapi/mapi/u_compiler.h4
3 files changed, 12 insertions, 6 deletions
diff --git a/src/egl/main/eglcompiler.h b/src/egl/main/eglcompiler.h
index 6ecee51d7c..90c75e84b2 100644
--- a/src/egl/main/eglcompiler.h
+++ b/src/egl/main/eglcompiler.h
@@ -62,10 +62,14 @@
/**
* Function visibility
*/
-#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
-# define PUBLIC __attribute__((visibility("default")))
-#else
-# define PUBLIC
+#ifndef PUBLIC
+# if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+# define PUBLIC __attribute__((visibility("default")))
+# elif defined(_MSC_VER)
+# define PUBLIC __declspec(dllexport)
+# else
+# define PUBLIC
+# endif
#endif
/**
diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h
index 9b31555f1b..a14486a5fb 100644
--- a/src/gallium/include/pipe/p_compiler.h
+++ b/src/gallium/include/pipe/p_compiler.h
@@ -102,6 +102,8 @@ typedef unsigned char boolean;
#ifndef PUBLIC
# if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
# define PUBLIC __attribute__((visibility("default")))
+# elif defined(_MSC_VER)
+# define PUBLIC __declspec(dllexport)
# else
# define PUBLIC
# endif
diff --git a/src/mapi/mapi/u_compiler.h b/src/mapi/mapi/u_compiler.h
index cc9e2cd1e8..f1752d16f2 100644
--- a/src/mapi/mapi/u_compiler.h
+++ b/src/mapi/mapi/u_compiler.h
@@ -28,10 +28,10 @@
#ifndef PUBLIC
# if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
# define PUBLIC __attribute__((visibility("default")))
-# define HIDDEN __attribute__((visibility("hidden")))
+# elif defined(_MSC_VER)
+# define PUBLIC __declspec(dllexport)
# else
# define PUBLIC
-# define HIDDEN
# endif
#endif