# HG changeset patch # User ohair # Date 1277251637 25200 # Node ID 4cc8b71dfb1942a1f471fa1c85b82ec8d6cd3fcc # Parent 1543637640fc9fc8d7f4b22c2730d20013ad729b 6939022: Source code adjustments for parfait compilation Reviewed-by: jjg diff -r 1543637640fc -r 4cc8b71dfb19 jdk/src/solaris/demo/jni/Poller/Poller.c --- 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);