X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fvisibility.h;h=72a15c12f55a152e91d1b5d7c243c0ac3f20769e;hb=d0f9a32dd1442ba083972642d6fed5cd59bce583;hp=73d01f182c8dcf3b81281b9bcdd3abd0e9c18911;hpb=de46e62fe493ce152e1804feec0d19d5d0cfaa9f;p=m6w6%2Flibmemcached

diff --git a/libtest/visibility.h b/libtest/visibility.h
index 73d01f18..72a15c12 100644
--- a/libtest/visibility.h
+++ b/libtest/visibility.h
@@ -1,9 +1,8 @@
 /*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  Gearmand client and server library.
  *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
- *  All rights reserved.
+ *  Data Differential YATL (i.e. libtest)  library
+ *
+ *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are
@@ -38,32 +37,41 @@
 #pragma once
 
 #if defined(BUILDING_LIBTEST)
-# if defined(HAVE_VISIBILITY)
+# if defined(HAVE_VISIBILITY) && HAVE_VISIBILITY
 #  define LIBTEST_API __attribute__ ((visibility("default")))
-#  define LIBTEST_INTERNAL_API __attribute__ ((visibility("hidden")))
-#  define LIBTEST_API_DEPRECATED __attribute__ ((deprecated,visibility("default")))
-#  define LIBTEST_LOCAL  __attribute__ ((visibility("hidden")))
+#  define LIBTEST_LOCAL  __attribute__ ((visibility("default")))
 # elif defined (__SUNPRO_C) && (__SUNPRO_C >= 0x550)
 #  define LIBTEST_API __global
-#  define LIBTEST_INTERNAL_API __hidden
-#  define LIBTEST_API_DEPRECATED __global
-#  define LIBTEST_LOCAL __hidden
+#  define LIBTEST_LOCAL __global
 # elif defined(_MSC_VER)
-#  define LIBTEST_API extern __declspec(dllexport)
-#  define LIBTEST_INTERNAL_API extern __declspec(dllexport)
-#  define LIBTEST_DEPRECATED_API extern __declspec(dllexport)
-#  define LIBTEST_LOCAL
-# endif /* defined(HAVE_VISIBILITY) */
-#else  /* defined(BUILDING_LIBTEST) */
-# if defined(_MSC_VER)
-#  define LIBTEST_API extern __declspec(dllimport)
-#  define LIBTEST_INTERNAL_API extern __declspec(dllimport)
-#  define LIBTEST_API_DEPRECATED extern __declspec(dllimport)
-#  define LIBTEST_LOCAL
+#  define LIBTEST_API extern __declspec(dllexport) 
+#  define LIBTEST_LOCAL extern __declspec(dllexport)
 # else
 #  define LIBTEST_API
-#  define LIBTEST_INTERNAL_API
-#  define LIBTEST_API_DEPRECATED
 #  define LIBTEST_LOCAL
-# endif /* defined(_MSC_VER) */
-#endif /* defined(BUILDING_LIBTEST) */
+# endif
+#else
+# if defined(BUILDING_LIBTEST)
+#  if defined(HAVE_VISIBILITY) && HAVE_VISIBILITY
+#   define LIBTEST_API __attribute__ ((visibility("default")))
+#   define LIBTEST_LOCAL  __attribute__ ((visibility("hidden")))
+#  elif defined (__SUNPRO_C) && (__SUNPRO_C >= 0x550)
+#   define LIBTEST_API __global
+#   define LIBTEST_LOCAL __hidden
+#  elif defined(_MSC_VER)
+#   define LIBTEST_API extern __declspec(dllexport) 
+#   define LIBTEST_LOCAL
+#  else
+#   define LIBTEST_API
+#   define LIBTEST_LOCAL
+#  endif /* defined(HAVE_VISIBILITY) */
+# else  /* defined(BUILDING_LIBTEST) */
+#  if defined(_MSC_VER)
+#   define LIBTEST_API extern __declspec(dllimport) 
+#   define LIBTEST_LOCAL
+#  else
+#   define LIBTEST_API
+#   define LIBTEST_LOCAL
+#  endif /* defined(_MSC_VER) */
+# endif /* defined(BUILDING_LIBTEST) */
+#endif /* defined(BUILDING_LIBTESTINTERNAL) */