fix processor DnD from sidebar.

[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 dfe9e053369c4d72e052e9e065beaf4ad2e5f4fc..9bcba6f327dacd8d13762db2f0bd815ae9c42674 100644 (file)
--- a/msvc_extra_headers/ardourext/misc.h.input
+++ b/msvc_extra_headers/ardourext/misc.h.input
@@ -27,7 +27,10 @@
 #define _CPP_VECTOR  1
 #endif
 
+#ifdef __cplusplus
 #include <vector>
+#endif
+
 #include <math.h>
 #include <float.h>
 #include <direct.h>
@@ -60,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
@@ -70,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).
@@ -171,16 +170,11 @@ typedef int register_t;
 
 // throw()
 #ifndef __THROW
+#ifdef __cplusplus
 #define __THROW  throw()
+#else
+#define __THROW
 #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
@@ -198,13 +192,15 @@ typedef _mode_t mode_t;
 #endif /* _MODE_T_ */
 
 // int64 abs()
-inline uint64_t abs(int64_t val)
+#ifdef __cplusplus // Normal 'C' doesn't permit over-ridden functions !!
+inline int64_t abs(int64_t val) throw()
 {
        if (val < 0)
                return val * (-1);
        else
                return val;
 }
+#endif
 
 // fmin() and fmax()
 #define fmin(a, b) min((double)a, (double)b)
@@ -221,8 +217,18 @@ inline uint64_t abs(int64_t val)
 
 
 // #include the main headers for Ardour MSVC
-#if defined(BUILDING_PBD) || defined(PBD_IS_IN_WIN_STATIC_LIB)
+#ifdef __cplusplus
+#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>
@@ -230,5 +236,23 @@ inline uint64_t abs(int64_t val)
 #if defined(BUILDING_RUBBERBAND) || defined(RUBBERBAND_IS_IN_WIN_STATIC_LIB)
 #include <rubberband/msvc_rubberband.h>
 #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
+
+#if !defined(LIBPBD_API) || defined(PBD_IS_IN_WIN_STATIC_LIB)
+extern  double round(double x);
+
+// log2().... MSVC doesn't offer the C99 function 'log2()'
+// so let's emulate it.
+extern  double log2(double x);
+#endif
 
 #endif /* __ardour_msvc_extensions_h__ */