My change to 477174 did not work. Keep our C++ copies of xwax files a…

…nd wrap them with extern C.
mixxxdj · Mar 29, 2014 · e359108 · e359108
1 parent ce3c119
commit e359108
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/build/features.py b/build/features.py
@@ -383,8 +383,8 @@ def sources(self, build):
                    'vinylcontrol/steadypitch.cpp',
                    'engine/vinylcontrolcontrol.cpp', ]
         if build.platform_is_windows:
-            sources.append("#lib/xwax/timecoder_win32.c")
-            sources.append("#lib/xwax/lut_win32.c")
+            sources.append("#lib/xwax/timecoder_win32.cpp")
+            sources.append("#lib/xwax/lut_win32.cpp")
         else:
             sources.append("#lib/xwax/timecoder.c")
             sources.append("#lib/xwax/lut.c")

diff --git a/lib/xwax/lut.c → lib/xwax/lut_win32.cpp b/lib/xwax/lut.c → lib/xwax/lut_win32.cpp
@@ -17,6 +17,8 @@
  *
  */
 
+extern "C" {
+
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -109,3 +111,5 @@ unsigned int lut_lookup(struct lut *lut, unsigned int timecode)
 
     return (unsigned)-1;
 }
+
+}; // extern "C"
diff --git a/lib/xwax/timecoder.h b/lib/xwax/timecoder.h
@@ -29,6 +29,10 @@
 
 #define TIMECODER_CHANNELS 2
 
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
 typedef unsigned int bits_t;
 
 struct timecode_def {
@@ -143,4 +147,8 @@ static inline double timecoder_revs_per_sec(struct timecoder *tc)
     return (33.0 + 1.0 / 3) * tc->speed / 60;
 }
 
+#ifdef __cplusplus
+};
+#endif // __cplusplus
+
 #endif
diff --git a/lib/xwax/timecoder_win32.c → lib/xwax/timecoder_win32.cpp b/lib/xwax/timecoder_win32.c → lib/xwax/timecoder_win32.cpp
@@ -17,6 +17,8 @@
  *
  */
 
+extern "C" {
+
 #include <assert.h>
 #include <limits.h>
 #include <stdio.h>
@@ -642,3 +644,5 @@ signed int timecoder_get_position(struct timecoder *tc, double *when)
 
     return r;
 }
+
+}; // extern "C"