Thread: [Java-game-lib-cvs] LWJGL/src/native/common/fmod extfmod.cpp,1.1,1.2 org_lwjgl_fmod_FSound.cpp,1.1,1

Update of /cvsroot/java-game-lib/LWJGL/src/native/common/fmod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv445/src/native/common/fmod

Modified Files:
	extfmod.cpp org_lwjgl_fmod_FSound.cpp 
Log Message:
Updated headers and fmod for linux

Index: extfmod.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod/extfmod.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- extfmod.cpp	23 May 2004 14:03:07 -0000	1.1
+++ extfmod.cpp	23 May 2004 14:46:07 -0000	1.2
@@ -29,23 +29,26 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#include <stdio.h>
+#endif
+
+#include <stdio.h>
 #include "extfmod.h"
 
 /** Instance of fmod  */
 FMOD_INSTANCE * fmod = NULL;
 
-/** Handle to dll */
-HINSTANCE dll_handle;
-
+#ifdef _WIN32
 /**
  * DLL entry point for Windows. Called when Java loads the .dll
  */
-BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
  dll_handle = hinstDLL;
+BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
 	return true;
 }
+#endif
 
 /**
  * Creates and loads the FMOD instance
@@ -63,4 +66,4 @@
   if (fmod != NULL) {
     FMOD_FreeInstance(fmod);
   }
-}
\ No newline at end of file
+}

Index: org_lwjgl_fmod_FSound.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod/org_lwjgl_fmod_FSound.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_fmod_FSound.cpp	23 May 2004 14:03:07 -0000	1.1
+++ org_lwjgl_fmod_FSound.cpp	23 May 2004 14:46:07 -0000	1.2
@@ -1201,7 +1201,7 @@
 */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FSound_FSOUND_1Stream_1Net_1SetProxy(JNIEnv * env, jclass clazz, jstring proxy) {
   const char * proxyString = env->GetStringUTFChars(proxy, 0);
-  boolean result = fmod->FSOUND_Stream_Net_SetProxy(proxyString);
+  jboolean result = fmod->FSOUND_Stream_Net_SetProxy(proxyString);
   env->ReleaseStringUTFChars(proxy, proxyString);
   return result;
 }
@@ -1754,4 +1754,4 @@
 */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FSound_nFSOUND_1Reverb_1GetChannelProperties(JNIEnv * env, jclass clazz, jint channel, jlong prop) {
   return fmod->FSOUND_Reverb_GetChannelProperties(channel, (FSOUND_REVERB_CHANNELPROPERTIES*) prop);
-}
\ No newline at end of file
+}