--- a/jdk/src/solaris/demo/jni/Poller/Poller.c Tue Jun 22 14:22:14 2010 -0400
+++ b/jdk/src/solaris/demo/jni/Poller/Poller.c Tue Jun 22 17:07:17 2010 -0700
@@ -160,10 +160,10 @@
return -1;
}
-#define MEMORY_EXCEPTION(str) throwOutOfMemoryError(env, "Poller:" ## str)
-#define STATE_EXCEPTION(str) throwIllegalStateException(env, "Poller:" ## str)
+#define MEMORY_EXCEPTION(str) throwOutOfMemoryError(env, "Poller:" str)
+#define STATE_EXCEPTION(str) throwIllegalStateException(env, "Poller:" str)
#define INTERRUPT_EXCEPTION(str) throwInterruptedIOException(env, \
- "Poller:" ## str)
+ "Poller:" str)
jint addfd(JNIEnv *, ioevent_t *, jint, jshort);
jint removefd(JNIEnv *, ioevent_t *, jint);