Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-30 08:34:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix to compile with debugging turned off

Browse source
This commit is contained in:
ehouse 2010-01-10 23:38:49 +00:00
parent e76306a543
commit 8d6d22f425
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
xwords4/android/xwjni.c
View file

@ -140,7 +140,8 @@ typedef struct _JNIState {
#define XWJNI_START() { \ #define XWJNI_START() { \
XP_ASSERT( 0 != gamePtr ); \ XP_ASSERT( 0 != gamePtr ); \
JNIState* state = (JNIState*)gamePtr; \ JNIState* state = (JNIState*)gamePtr; \
MemPoolCtx* mpool = state->mpool; \ MPSLOT; \
MPASSIGN( mpool, state->mpool); \
AndGlobals* globals = &state->globals; \ AndGlobals* globals = &state->globals; \
LOG_FUNC(); \ LOG_FUNC(); \
/* if reentrant must be from same thread */ \ /* if reentrant must be from same thread */ \
@ -157,10 +158,12 @@ JNIEXPORT jint JNICALL
Java_org_eehouse_android_xw4_jni_XwJNI_initJNI Java_org_eehouse_android_xw4_jni_XwJNI_initJNI
( JNIEnv* env, jclass C ) ( JNIEnv* env, jclass C )
{ {
#ifdef MEM_DEBUG
MemPoolCtx* mpool = mpool_make(); MemPoolCtx* mpool = mpool_make();
#endif
JNIState* state = (JNIState*)XP_CALLOC( mpool, sizeof(*state) ); JNIState* state = (JNIState*)XP_CALLOC( mpool, sizeof(*state) );
AndGlobals* globals = &state->globals; AndGlobals* globals = &state->globals;
state->mpool = mpool; MPASSIGN( state->mpool, mpool );
globals->vtMgr = make_vtablemgr(MPPARM_NOCOMMA(mpool)); globals->vtMgr = make_vtablemgr(MPPARM_NOCOMMA(mpool));
return (jint) state; return (jint) state;
@ -194,7 +197,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_game_1makeNewGame
#ifdef STUBBED_DICT #ifdef STUBBED_DICT
if ( !dict ) { if ( !dict ) {
XP_LOGF( "falling back to stubbed dict" ); XP_LOGF( "falling back to stubbed dict" );
dict = make_stubbed_dict( mpool ); dict = make_stubbed_dict( MPPARM_NOCOMMA(mpool) );
} }
#endif #endif
XP_ASSERT( !!dict ); XP_ASSERT( !!dict );
@ -207,10 +210,12 @@ JNIEXPORT void JNICALL Java_org_eehouse_android_xw4_jni_XwJNI_game_1dispose
{ {
LOG_FUNC(); LOG_FUNC();
JNIState* state = (JNIState*)gamePtr; JNIState* state = (JNIState*)gamePtr;
#ifdef MEM_DEBUG
MemPoolCtx* mpool = state->mpool; MemPoolCtx* mpool = state->mpool;
#endif
AndGlobals* globals = &state->globals; AndGlobals* globals = &state->globals;
destroyGI( mpool, globals->gi ); destroyGI( MPPARM(mpool) globals->gi );
JNIEnv* oldEnv = state->env; JNIEnv* oldEnv = state->env;
state->env = env; state->env = env;
@ -218,7 +223,7 @@ JNIEXPORT void JNICALL Java_org_eehouse_android_xw4_jni_XwJNI_game_1dispose
destroyDraw( globals->dctx ); destroyDraw( globals->dctx );
destroyUtil( globals->util ); destroyUtil( globals->util );
vtmgr_destroy( mpool, globals->vtMgr ); vtmgr_destroy( MPPARM(mpool) globals->vtMgr );
state->env = oldEnv; state->env = oldEnv;
XP_FREE( mpool, state ); XP_FREE( mpool, state );
@ -241,7 +246,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_game_1makeFromStream
globals->dctx = makeDraw( MPPARM(mpool) &state->env, jdraw ); globals->dctx = makeDraw( MPPARM(mpool) &state->env, jdraw );
jbyte* jelems = (*env)->GetByteArrayElements( env, jstream, NULL ); jbyte* jelems = (*env)->GetByteArrayElements( env, jstream, NULL );
XWStreamCtxt* stream = mem_stream_make( mpool, globals->vtMgr, XWStreamCtxt* stream = mem_stream_make( MPPARM(mpool) globals->vtMgr,
NULL, 0, NULL ); NULL, 0, NULL );
int len = (*env)->GetArrayLength( env, jstream ); int len = (*env)->GetArrayLength( env, jstream );
XP_LOGF( "putting %d bytes into stream", len ); XP_LOGF( "putting %d bytes into stream", len );
@ -250,7 +255,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_game_1makeFromStream
CommonPrefs cp; CommonPrefs cp;
(void)loadCommonPrefs( env, &cp, jcp ); (void)loadCommonPrefs( env, &cp, jcp );
result = game_makeFromStream( mpool, stream, &state->game, result = game_makeFromStream( MPPARM(mpool) stream, &state->game,
globals->gi, dict, globals->gi, dict,
globals->util, globals->dctx, &cp, globals->util, globals->dctx, &cp,
NULL ); NULL );
@ -270,7 +275,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_game_1saveToStream
XWJNI_START(); XWJNI_START();
CurGameInfo* gi = makeGI( MPPARM(mpool) env, jgi ); CurGameInfo* gi = makeGI( MPPARM(mpool) env, jgi );
XWStreamCtxt* stream = mem_stream_make( mpool, globals->vtMgr, XWStreamCtxt* stream = mem_stream_make( MPPARM(mpool) globals->vtMgr,
NULL, 0, NULL ); NULL, 0, NULL );
game_saveToStream( &state->game, gi, stream ); game_saveToStream( &state->game, gi, stream );