svn commit: r933629 - /commons/proper/daemon/trunk/src/native/nt/procrun/src/javajni.c

[sebb]

Author: sebb
Date: Tue Apr 13 14:19:47 2010
New Revision: 933629

URL: http://svn.apache.org/viewvc?rev=933629&view=rev
Log:
Remove extraneous ## token-pasting characters

Modified:
    commons/proper/daemon/trunk/src/native/nt/procrun/src/javajni.c

Modified: commons/proper/daemon/trunk/src/native/nt/procrun/src/javajni.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/nt/procrun/src/javajni.c?rev=933629&r1=933628&r2=933629&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/nt/procrun/src/javajni.c (original)
+++ commons/proper/daemon/trunk/src/native/nt/procrun/src/javajni.c Tue Apr 13 
14:19:47 2010
@@ -53,9 +53,9 @@ static DYNLOAD_FPTR_DECLARE(SetDllDirect
 
 #define JVM_DELETE_CLAZZ(jvm, cl)                                              
 \
     APXMACRO_BEGIN                                                             
 \
-    if ((jvm)->lpEnv && (jvm)->##cl.jClazz) {                                  
 \
-        (*((jvm)->lpEnv))->DeleteGlobalRef((jvm)->lpEnv, (jvm)->##cl.jClazz);  
 \
-        (jvm)->##cl.jClazz = NULL;                                             
 \
+    if ((jvm)->lpEnv && (jvm)->cl.jClazz) {                                   \
+        (*((jvm)->lpEnv))->DeleteGlobalRef((jvm)->lpEnv, (jvm)->cl.jClazz);   \
+        (jvm)->cl.jClazz = NULL;                                              \
     } APXMACRO_END
 
 #define JVM_EXCEPTION_CHECK(jvm) \
@@ -84,19 +84,19 @@ static DYNLOAD_FPTR_DECLARE(SetDllDirect
         (*(lpJava->lpEnv))->DeleteLocalRef(lpJava->lpEnv, obj)
 
 #define JNICALL_0(fName)  \
-        ((*(lpJava->lpEnv))->##fName(lpJava->lpEnv))
+        ((*(lpJava->lpEnv))->fName(lpJava->lpEnv))
 
 #define JNICALL_1(fName, a1)  \
-        ((*(lpJava->lpEnv))->##fName(lpJava->lpEnv, (a1)))
+        ((*(lpJava->lpEnv))->fName(lpJava->lpEnv, (a1)))
 
 #define JNICALL_2(fName, a1, a2)  \
-        ((*(lpJava->lpEnv))->##fName(lpJava->lpEnv, (a1), (a2)))
+        ((*(lpJava->lpEnv))->fName(lpJava->lpEnv, (a1), (a2)))
 
 #define JNICALL_3(fName, a1, a2, a3)  \
-        ((*(lpJava->lpEnv))->##fName(lpJava->lpEnv, (a1), (a2), (a3)))
+        ((*(lpJava->lpEnv))->fName(lpJava->lpEnv, (a1), (a2), (a3)))
 
 #define JNICALL_4(fName, a1, a2, a3, a4)  \
-        ((*(lpJava->lpEnv))->##fName(lpJava->lpEnv, (a1), (a2), (a3), (a4)))
+        ((*(lpJava->lpEnv))->fName(lpJava->lpEnv, (a1), (a2), (a3), (a4)))
 
 typedef struct APXJAVASTDCLAZZ {
     CHAR        sClazz[1024];