Merge branch 'master' into cairocanvas

[ardour.git] / msvc_extra_headers / ardourext / misc.h.input

diff --git a/msvc_extra_headers/ardourext/misc.h.input b/msvc_extra_headers/ardourext/misc.h.input
index 63ce6c562c8cef006eb22c9ce92143c4698dfcae..79fb5aafab2e4c7894219dc5335e8cf9d5b80d91 100644 (file)
--- a/msvc_extra_headers/ardourext/misc.h.input
+++ b/msvc_extra_headers/ardourext/misc.h.input
@@ -63,6 +63,7 @@
 #define getcwd     _getcwd
 #define getpid     _getpid
 #define snprintf   _snprintf
+#define random      rand
 #define link        ntfs_link
 #define unlink      ntfs_unlink
 #define strcasecmp  stricmp
@@ -73,11 +74,6 @@
 #ifndef PATH_MAX
 #define PATH_MAX _MAX_PATH
 #endif
-#define DECLARE_DEFAULT_COMPARISONS(Type) \
-       extern bool operator >  (const Type& lhs, const Type& rhs); \
-       extern bool operator <  (const Type& lhs, const Type& rhs); \
-       extern bool operator != (const Type& lhs, const Type& rhs); \
-       extern bool operator == (const Type& lhs, const Type& rhs);
 
 // Types missing from Win32 'stat.h' (hopefully Windows
 // will either act sensibly or ignore most of them).
@@ -181,15 +177,6 @@ typedef int register_t;
 #endif
 #endif
 
-// round().... Unlike Linux, Windows doesn't seem to support the
-// concept of a system-wide (or programmable) rounding direction.
-// Fortunately, 'round to nearest' seems to be the default action
-// under Linux, so let's copy that until we find out otherwise.
-#define rint(value)  round(value)
-#if !defined(PBD_API) || defined(PBD_IS_IN_WIN_STATIC_LIB)
-extern  double round(double x);
-#endif
-
 // System V compatibility
 typedef unsigned short ushort;
 typedef unsigned int   uint;
@@ -231,8 +218,17 @@ inline uint64_t abs(int64_t val)
 
 // #include the main headers for Ardour MSVC
 #ifdef __cplusplus
-#if defined(BUILDING_PBD) || defined(PBD_IS_IN_WIN_STATIC_LIB)
+#if defined(LIBPBD_DLL) || defined(PBD_IS_IN_WIN_STATIC_LIB)
 #include <pbd/msvc_pbd.h>
+
+#ifdef LIBPBD_DLL
+#define DEFAULT_COMPARISONS_DEFINED
+#define DECLARE_DEFAULT_COMPARISONS(Type) \
+       LIBPBD_API bool operator >  (const Type& lhs, const Type& rhs); \
+       LIBPBD_API bool operator <  (const Type& lhs, const Type& rhs); \
+       LIBPBD_API bool operator != (const Type& lhs, const Type& rhs); \
+       LIBPBD_API bool operator == (const Type& lhs, const Type& rhs);
+#endif
 #endif
 #if defined(BUILDING_LIBARDOUR) || defined(LIBARDOUR_IS_IN_WIN_STATIC_LIB)
 #include <ardour/msvc_libardour.h>
@@ -242,4 +238,22 @@ inline uint64_t abs(int64_t val)
 #endif
 #endif // __cplusplus
 
+#ifndef DEFAULT_COMPARISONS_DEFINED
+#define DEFAULT_COMPARISONS_DEFINED
+#define DECLARE_DEFAULT_COMPARISONS(Type) \
+       extern bool operator >  (const Type& lhs, const Type& rhs); \
+       extern bool operator <  (const Type& lhs, const Type& rhs); \
+       extern bool operator != (const Type& lhs, const Type& rhs); \
+       extern bool operator == (const Type& lhs, const Type& rhs);
+#endif
+
+// round().... Unlike Linux, Windows doesn't seem to support the
+// concept of a system-wide (or programmable) rounding direction.
+// Fortunately, 'round to nearest' seems to be the default action
+// under Linux, so let's copy that until we find out otherwise.
+#define rint(value)  round(value)
+#if !defined(LIBPBD_API) || defined(PBD_IS_IN_WIN_STATIC_LIB)
+extern  double round(double x);
+#endif
+
 #endif /* __ardour_msvc_extensions_h__ */