From 04eeebc3a41b9349c263e93e091b69cd0b9a85c4 Mon Sep 17 00:00:00 2001 From: Eric House Date: Sun, 8 Sep 2013 19:08:58 -0700 Subject: [PATCH] fix so still compiles when chat feature is disabled --- xwords4/android/XWords4/jni/utilwrapper.c | 4 ++++ xwords4/android/XWords4/jni/xwjni.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/xwords4/android/XWords4/jni/utilwrapper.c b/xwords4/android/XWords4/jni/utilwrapper.c index d29d610c0..d0f82d6a7 100644 --- a/xwords4/android/XWords4/jni/utilwrapper.c +++ b/xwords4/android/XWords4/jni/utilwrapper.c @@ -446,6 +446,7 @@ and_util_warnIllegalWord( XW_UtilCtxt* uc, BadWordInfo* bwi, return result; } +#ifdef XWFEATURE_CHAT static void and_util_showChat( XW_UtilCtxt* uc, const XP_UCHAR const* msg ) { @@ -455,6 +456,7 @@ and_util_showChat( XW_UtilCtxt* uc, const XP_UCHAR const* msg ) deleteLocalRef( env, jmsg ); UTIL_CBK_TAIL(); } +#endif static void and_util_remSelected(XW_UtilCtxt* uc) @@ -672,7 +674,9 @@ makeUtil( MPFORMAL JNIEnv** envp, jobject jutil, CurGameInfo* gi, SET_PROC(makeEmptyDict); SET_PROC(getUserString); SET_PROC(warnIllegalWord); +#ifdef XWFEATURE_CHAT SET_PROC(showChat); +#endif SET_PROC(remSelected); #ifndef XWFEATURE_MINIWIN diff --git a/xwords4/android/XWords4/jni/xwjni.c b/xwords4/android/XWords4/jni/xwjni.c index 535405ece..d1139c35e 100644 --- a/xwords4/android/XWords4/jni/xwjni.c +++ b/xwords4/android/XWords4/jni/xwjni.c @@ -1362,6 +1362,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_server_1endGame XWJNI_END(); } +#ifdef XWFEATURE_CHAT JNIEXPORT void JNICALL Java_org_eehouse_android_xw4_jni_XwJNI_server_1sendChat ( JNIEnv* env, jclass C, jint gamePtr, jstring jmsg ) @@ -1373,6 +1374,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_server_1sendChat (*env)->ReleaseStringUTFChars( env, jmsg, msg ); XWJNI_END(); } +#endif #ifdef XWFEATURE_WALKDICT ////////////////////////////////////////////////////////////