Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-04 20:46:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

we need the base64 stuff even when don't have SMS -- for serialization.

Browse source
This commit is contained in:
Eric House 2012-07-07 11:05:45 -07:00
parent 052725aabc
commit 318cc52f5a
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
xwords4/android/XWords4/jni/Android.mk
View file

@ -32,6 +32,7 @@ local_DEFINES += \
-DFEATURE_TRAY_EDIT \ -DFEATURE_TRAY_EDIT \
-DMAX_ROWS=32 \ -DMAX_ROWS=32 \
-DHASH_STREAM \ -DHASH_STREAM \
-DXWFEATURE_BASE64 \
-DINITIAL_CLIENT_VERS=2 \ -DINITIAL_CLIENT_VERS=2 \
-DNODE_CAN_4 \ -DNODE_CAN_4 \
-DRELAY_ROOM_DEFAULT=\"\" \ -DRELAY_ROOM_DEFAULT=\"\" \

2
xwords4/android/XWords4/jni/xwjni.c
View file

@ -1581,7 +1581,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_dict_1iter_1getStartsWith
return result; return result;
} }
#ifdef XWFEATURE_SMS #ifdef XWFEATURE_BASE64
JNIEXPORT jstring JNICALL JNIEXPORT jstring JNICALL
Java_org_eehouse_android_xw4_jni_XwJNI_base64Encode Java_org_eehouse_android_xw4_jni_XwJNI_base64Encode
( JNIEnv* env, jclass C, jbyteArray jbytes ) ( JNIEnv* env, jclass C, jbyteArray jbytes )

2
xwords4/common/strutils.c
View file

@ -255,7 +255,7 @@ randIntArray( XP_U16* rnums, XP_U16 count )
return changed; return changed;
} /* randIntArray */ } /* randIntArray */
#ifdef XWFEATURE_SMS #ifdef XWFEATURE_BASE64
/* base-64 encode binary data as a message legal for SMS. See /* 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 * 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 * so it's not needed on linux, but unless all platforms provided identical

2
xwords4/common/strutils.h
View file

@ -88,7 +88,7 @@ XP_UCHAR* emptyStringIfNull( XP_UCHAR* str );
/* Produce an array of ints 0..count-1, juggled */ /* Produce an array of ints 0..count-1, juggled */
XP_Bool randIntArray( XP_U16* rnums, XP_U16 count ); 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 ); 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 ); XP_Bool smsToBin( XP_U8* out, XP_U16* outlen, const XP_UCHAR* in, XP_U16 inlen );
#endif #endif