btbredr: fix NESTING_INDENT_MISMATCH (CID 1358479)

[metze/wireshark/wip.git] / ws_symbol_export.h

diff --git a/ws_symbol_export.h b/ws_symbol_export.h
index 5654ad1243026950a168e65deddc2f2f86e5f45d..45082d3256b3a1cf10c47afdbe62f4b4e3db1252 100644 (file)
--- a/ws_symbol_export.h
+++ b/ws_symbol_export.h
@@ -47,6 +47,29 @@
 #ifndef SYMBOL_EXPORT_H
 #define SYMBOL_EXPORT_H
 
+/*
+ * NOTE: G_HAVE_GNUC_VISIBILITY is defined only if all of
+ *
+ *    __attribute__ ((visibility ("hidden")))
+ *
+ *    __attribute__ ((visibility ("internal")))
+ *
+ *    __attribute__ ((visibility ("protected")))
+ *
+ *    __attribute__ ((visibility ("default")))
+ *
+ * are supported, and at least some versions of GCC from Apple support
+ * "default" and "hidden" but not "internal" or "protected", so it
+ * shouldn't be used to determine whether "hidden" or "default" is
+ * supported.
+ *
+ * This also means that we shouldn't use G_GNUC_INTERNAL instead of
+ * WS_DLL_LOCAL, as GLib uses G_HAVE_GNUC_VISIBILITY to determine
+ * whether to use __attribute__ ((visibility ("hidden"))) for
+ * G_GNUC_INTERNAL, and that will not use it even with compilers
+ * that support it.
+ */
+
 /* Originally copied from GCC Wiki at http://gcc.gnu.org/wiki/Visibility */
 #if defined _WIN32 || defined __CYGWIN__
   /* Compiling for Windows, so we use the Windows DLL declarations. */
@@ -83,15 +106,24 @@
 #define WS_DLL_PUBLIC_DEF __attribute__ ((dllimport))
     #elif ! (defined ENABLE_STATIC) /* ! __GNUC__ */
       /*
-       * Presumably MSVC.
+       * Presumably MSVC, and we're not building all-static.
        * Note: actually gcc seems to also support this syntax.
        */
 #define WS_DLL_PUBLIC_DEF __declspec(dllimport)
     #else /* ! __GNUC__  && ENABLE_STATIC */
-      /* presumably MSVC */
+      /*
+       * Presumably MSVC, and we're building all-static, so we're
+       * not building any DLLs.
+       */
 #define WS_DLL_PUBLIC_DEF
     #endif /* __GNUC__ */
   #endif /* WS_BUILD_DLL */
+
+  /*
+   * Symbols in a DLL are *not* exported unless they're specifically
+   * flagged as exported, so, for a non-static but non-exported
+   * symbol, we don't have to do anything.
+   */
   #define WS_DLL_LOCAL
 #else /* defined _WIN32 || defined __CYGWIN__ */
   /*
@@ -101,19 +133,64 @@
    * with GCC 4 or later.
    */
   #if __GNUC__ >= 4
+    /*
+     * Symbols exported from libraries.
+     */
 #define WS_DLL_PUBLIC_DEF __attribute__ ((visibility ("default")))
+
+    /*
+     * Non-static symbols *not* exported from libraries.
+     */
 #define WS_DLL_LOCAL  __attribute__ ((visibility ("hidden")))
   #else /* ! __GNUC__ >= 4 */
-    #define WS_DLL_PUBLIC_DEF
-    #define WS_DLL_LOCAL
+    /*
+     * We have no way to make stuff not explicitly marked as
+     * visible invisible outside a library, but we might have
+     * a way to make stuff explicitly marked as local invisible
+     * outside the library.
+     *
+     * This was lifted from GLib; see above for why we don't use
+     * G_GNUC_INTERNAL.
+     */
+    #if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
+      /* This supports GCC-style __attribute__ ((visibility (XXX))) */
+      #define WS_DLL_PUBLIC_DEF __attribute__ ((visibility ("default")))
+      #define WS_DLL_LOCAL __attribute__ ((visibility ("hidden")))
+    #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
+      /* This doesn't, but supports __global and __hidden */
+      #define WS_DLL_PUBLIC_DEF __global
+      #define WS_DLL_LOCAL __hidden
+    #else /* not Sun C with "hidden" support */
+      #define WS_DLL_PUBLIC_DEF
+      #define WS_DLL_LOCAL
+    #endif
   #endif /* __GNUC__ >= 4 */
 #endif
 
 /*
- * Use this for declarations; it can also be used for exported
- * *function* definitions, but must not be used for exported *data*
- * definitions.
+ * You *must* use this for exported data *declarations*; if you use
+ * WS_DLL_PUBLIC_DEF, some compilers, such as MSVC++, will complain
+ * about array definitions with no size.
+ *
+ * You must *not* use this for exported data *definitions*, as that
+ * will, for some compilers, cause warnings about items being initialized
+ * and declared extern.
+ *
+ * Either can be used for exported *function* declarations and definitions.
  */
-#define WS_DLL_PUBLIC  WS_DLL_PUBLIC_DEF extern
+#define WS_DLL_PUBLIC  WS_DLL_PUBLIC_DEF extern
 
 #endif /* SYMBOL_EXPORT_H */
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local Variables:
+ * c-basic-offset: 2
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=2 tabstop=8 expandtab:
+ * :indentSize=2:tabSize=8:noTabs=true:
+ */