Changeset 253

Timestamp:

Feb 6, 2011, 11:21:47 PM (15 years ago)

Author:

dmik

Message:

jdk/jsound: Using extern "C" around headers is plain wrong.

Location:

trunk/openjdk/jdk/src

Files:

• share/native/com/sun/media/sound/PlatformMidi.h (modified) (7 diffs)
• share/native/com/sun/media/sound/Utilities.h (modified) (2 diffs)
• windows/native/com/sun/media/sound/PLATFORM_API_WinOS_MidiIn.cpp (modified) (1 diff)
• windows/native/com/sun/media/sound/PLATFORM_API_WinOS_Util.h (modified) (2 diffs)

trunk/openjdk/jdk/src/share/native/com/sun/media/sound/PlatformMidi.h

@@ -115 +115 @@
 #if USE_MIDI_QUEUE == TRUE
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * Native Locking support
@@ -142 +146 @@
 void MIDI_QueueClear(MidiMessageQueue* queue);
 
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
 #endif /* USE_MIDI_QUEUE */
 
@@ -160 +168 @@
 #define MIDI_IN_LONG_MESSAGE_SIZE 1024
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /*
@@ -165 +176 @@
  */
 char* MIDI_IN_GetErrorStr(INT32 err);
-
 
 /*
@@ -243 +253 @@
 void MIDI_IN_ReleaseMessage(MidiDeviceHandle* handle, MidiMessage* msg);
 
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
 #endif // USE_PLATFORM_MIDI_IN
 
@@ -261 +275 @@
 #define MIDI_OUT_LONG_MESSAGE_SIZE 1024
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * Return an error message for the error code
  */
 char* MIDI_OUT_GetErrorStr(INT32 err);
-
 
 /*
@@ -331 +348 @@
 INT32 MIDI_OUT_SendLongMessage(MidiDeviceHandle* handle, UBYTE* data, UINT32 size, UINT32 timestamp);
 
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
 #endif // USE_PLATFORM_MIDI_OUT
 

trunk/openjdk/jdk/src/share/native/com/sun/media/sound/Utilities.h

@@ -27 +27 @@
 #include "SoundDefs.h"
 #include "Configure.h"          // put flags for debug msgs etc. here
-
-// return 1 if this platform is big endian, or 0 for little endian
-int UTIL_IsBigEndianPlatform();
-
 
 // ERROR PRINTS
@@ -81 +77 @@
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// return 1 if this platform is big endian, or 0 for little endian
+int UTIL_IsBigEndianPlatform();
 
 void ThrowJavaMessageException(JNIEnv *e, const char *exClass, const char *msg);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+

trunk/openjdk/jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_MidiIn.cpp

@@ -28 +28 @@
 
 /* include Java Sound specific headers as C code */
-extern "C" {
 #include "PLATFORM_API_WinOS_Util.h"
-}
 
 #if USE_PLATFORM_MIDI_IN == TRUE

trunk/openjdk/jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_Util.h

@@ -55 +55 @@
 } SysExQueue;
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* set the startTime field in MidiDeviceHandle */
 void MIDI_SetStartTime(MidiDeviceHandle* handle);
@@ -66 +71 @@
 void MIDI_WinDestroyLongBufferQueue(MidiDeviceHandle* handle);
 
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
 #endif // USE_PLATFORM_MIDI_IN || USE_PLATFORM_MIDI_OUT