Changeset 176

Timestamp:

Nov 23, 2010, 10:12:57 PM (15 years ago)

Author:

dmik

Message:

jdk: Make jsound.dll build.

Location:

trunk/openjdk/jdk

Files:

• make/javax/sound/SoundDefs.gmk (modified) (1 diff)
• src/share/native/com/sun/media/sound/SoundDefs.h (modified) (1 diff)

trunk/openjdk/jdk/make/javax/sound/SoundDefs.gmk

@@ -36 +36 @@
   CPPFLAGS += -DX_PLATFORM=X_WINDOWS
 endif # PLATFORM windows
+
+ifeq ($(PLATFORM), os2)
+  # we reuse most of the Windows code
+  CPPFLAGS += -DX_PLATFORM=X_WINDOWS
+endif # PLATFORM os2
 
 ifeq ($(PLATFORM), linux)

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

@@ -117 +117 @@
 #if X_PLATFORM == X_WINDOWS
 #include <stdlib.h>
+#ifndef INLINE
 #define INLINE          _inline
+#endif
 #endif