diff --git a/xwords4/android/XWords4/jni/Android.mk b/xwords4/android/XWords4/jni/Android.mk index e09c94f3b..671e37409 100644 --- a/xwords4/android/XWords4/jni/Android.mk +++ b/xwords4/android/XWords4/jni/Android.mk @@ -32,6 +32,7 @@ local_DEFINES += \ -DFEATURE_TRAY_EDIT \ -DMAX_ROWS=32 \ -DHASH_STREAM \ + -DXWFEATURE_BASE64 \ -DINITIAL_CLIENT_VERS=2 \ -DNODE_CAN_4 \ -DRELAY_ROOM_DEFAULT=\"\" \ diff --git a/xwords4/android/XWords4/jni/xwjni.c b/xwords4/android/XWords4/jni/xwjni.c index 03c67b46a..aa968f0b7 100644 --- a/xwords4/android/XWords4/jni/xwjni.c +++ b/xwords4/android/XWords4/jni/xwjni.c @@ -1581,7 +1581,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_dict_1iter_1getStartsWith return result; } -#ifdef XWFEATURE_SMS +#ifdef XWFEATURE_BASE64 JNIEXPORT jstring JNICALL Java_org_eehouse_android_xw4_jni_XwJNI_base64Encode ( JNIEnv* env, jclass C, jbyteArray jbytes ) diff --git a/xwords4/common/strutils.c b/xwords4/common/strutils.c index cc1c762d9..303890303 100644 --- a/xwords4/common/strutils.c +++ b/xwords4/common/strutils.c @@ -255,7 +255,7 @@ randIntArray( XP_U16* rnums, XP_U16 count ) return changed; } /* randIntArray */ -#ifdef XWFEATURE_SMS +#ifdef XWFEATURE_BASE64 /* base-64 encode binary data as a message legal for SMS. See * http://www.ietf.org/rfc/rfc2045.txt for the algorithm. glib uses this and * so it's not needed on linux, but unless all platforms provided identical diff --git a/xwords4/common/strutils.h b/xwords4/common/strutils.h index b02671541..b4a200fb7 100644 --- a/xwords4/common/strutils.h +++ b/xwords4/common/strutils.h @@ -88,7 +88,7 @@ XP_UCHAR* emptyStringIfNull( XP_UCHAR* str ); /* Produce an array of ints 0..count-1, juggled */ XP_Bool randIntArray( XP_U16* rnums, XP_U16 count ); -#ifdef XWFEATURE_SMS +#ifdef XWFEATURE_BASE64 void binToSms( XP_UCHAR* out, XP_U16* outlen, const XP_U8* in, XP_U16 inlen ); XP_Bool smsToBin( XP_U8* out, XP_U16* outlen, const XP_UCHAR* in, XP_U16 inlen ); #endif