Changeset 326 for trunk/nom/include/nom.h

Timestamp:

Apr 9, 2008, 10:22:08 PM (17 years ago)

Author:

cinc

Message:

Portability patches for Windows, Linux, Darwin by Bird.

File:

• trunk/nom/include/nom.h (modified) (2 diffs)

trunk/nom/include/nom.h

@@ -43 +43 @@
   #define NOMEXTERN extern "C"
  #else
-   #define NOMEXTERN extern
+  #define NOMEXTERN extern
  #endif
 #endif
@@ -65 +65 @@
 #define NOMDLINK
 
+/** @def NOMDLLEXPORT 
+ * Used for exporting a symbol. 
+ * See __declspec(dllexport) in the Visual C++ reference for details. */
+/** @def NOMDLLIMPORT 
+ * Used for importing a symbol from a DLL/so. 
+ * See __declspec(dllimport) in the Visual C++ reference for details. */
+#if defined(_WIN32) || (defined(__OS2__) && defined(__GNUC__) && defined(__declspec))
+# define NOMDLLEXPORT __declspec(dllexport)
+# define NOMDLLIMPORT __declspec(dllimport)
+#elif defined(__GNUC__)
+# if __GNUC__ >= 4
+#  define NOMDLLEXPORT __attribute__((visibility("default")))
+# else
+#  define NOMDLLEXPORT
+# endif
+# define NOMDLLIMPORT
+#else
+# define NOMDLLEXPORT
+# define NOMDLLIMPORT
+#endif
+
 typedef void* NOMLINK nomMethodProc(void*);
 
 #ifndef NULL
-#define NULL ((void *) 0)
+# ifdef __cplusplus
+#  define NULL 0
+# else
+#  define NULL ((void *) 0)
+# endif
 #endif