Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add a few consts decls where APIs changed; use XWFEATURE_RELAY rather

Browse source 
than BEYOND_IR
This commit is contained in:
ehouse 2006-10-22 19:44:30 +00:00
parent 1aa6d81177
commit 912fe93829
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wince/Makefile
View file

@ -42,7 +42,7 @@ LFLAGS += -Wl,--major-subsystem-version,4,--minor-subsystem-version,20
ifdef HAVE_COMMCTRL ifdef HAVE_COMMCTRL
CELIBS += -lcommctrl -laygshell CELIBS += -lcommctrl -laygshell
else else
CFLAGS += -DCANT_DO_CMDBAR -DBEYOND_IR CFLAGS += -DCANT_DO_CMDBAR -DXWFEATURE_RELAY
endif endif
else # ifeq ($(TARGET_OS),wince) else # ifeq ($(TARGET_OS),wince)
ifeq ($(TARGET_OS),win32) ifeq ($(TARGET_OS),win32)
@ -51,7 +51,7 @@ WINDRES = i586-mingw32msvc-windres
STRIP = i586-mingw32msvc-strip STRIP = i586-mingw32msvc-strip
TARGET_OS_DEF = -DTARGET_OS_WIN32 TARGET_OS_DEF = -DTARGET_OS_WIN32
CELIBS += -lws2_32 CELIBS += -lws2_32
CFLAGS += -DCANT_DO_CMDBAR -DBEYOND_IR -DDRAW_LINK_DIRECT CFLAGS += -DCANT_DO_CMDBAR -DXWFEATURE_RELAY -DDRAW_LINK_DIRECT
#CFLAGS += -DFORCE_HEIGHT=240 -DFORCE_WIDTH=320 #CFLAGS += -DFORCE_HEIGHT=240 -DFORCE_WIDTH=320
endif endif
endif endif

12
wince/cedict.c
View file

@ -36,7 +36,7 @@ typedef struct CEDictionaryCtxt {
} CEDictionaryCtxt; } CEDictionaryCtxt;
static void ce_dict_destroy( DictionaryCtxt* dict ); static void ce_dict_destroy( DictionaryCtxt* dict );
static XP_UCHAR* ce_dict_getShortName( const DictionaryCtxt* dict ); static const XP_UCHAR* ce_dict_getShortName( const DictionaryCtxt* dict );
static void ceLoadSpecialData( CEDictionaryCtxt* ctxt, XP_U8** ptrp ); static void ceLoadSpecialData( CEDictionaryCtxt* ctxt, XP_U8** ptrp );
static XP_U16 ceCountSpecials( CEDictionaryCtxt* ctxt ); static XP_U16 ceCountSpecials( CEDictionaryCtxt* ctxt );
static XP_Bitmap* ceMakeBitmap( CEDictionaryCtxt* ctxt, XP_U8** ptrp ); static XP_Bitmap* ceMakeBitmap( CEDictionaryCtxt* ctxt, XP_U8** ptrp );
@ -427,10 +427,10 @@ ce_dict_destroy( DictionaryCtxt* dict )
XP_FREE( ctxt->super.mpool, ctxt ); XP_FREE( ctxt->super.mpool, ctxt );
} // ce_dict_destroy } // ce_dict_destroy
static XP_UCHAR* static const XP_UCHAR*
ce_dict_getShortName( const DictionaryCtxt* dict ) ce_dict_getShortName( const DictionaryCtxt* dict )
{ {
XP_UCHAR* name = dict_getName( dict ); const XP_UCHAR* name = dict_getName( dict );
return bname( name ); return bname( name );
} /* ce_dict_getShortName */ } /* ce_dict_getShortName */
@ -850,11 +850,11 @@ n_ptr_tohs( XP_U8** inp )
return XP_NTOHS(t); return XP_NTOHS(t);
} /* n_ptr_tohs */ } /* n_ptr_tohs */
XP_UCHAR* const XP_UCHAR*
bname( XP_UCHAR* in ) bname( const XP_UCHAR* in )
{ {
XP_U16 len = (XP_U16)XP_STRLEN(in); XP_U16 len = (XP_U16)XP_STRLEN(in);
XP_UCHAR* out = in + len - 1; const XP_UCHAR* out = in + len - 1;
while ( *out != '\\' && out >= in ) { while ( *out != '\\' && out >= in ) {
--out; --out;

2
wince/cedict.h
View file

@ -49,5 +49,5 @@ void ceFormatDictDirs( XWStreamCtxt* stream, HINSTANCE hInstance );
return value (which is into buf, but not necessarily the first char.) */ return value (which is into buf, but not necessarily the first char.) */
wchar_t* wbname( wchar_t* buf, XP_U16 buflen, const wchar_t* in ); wchar_t* wbname( wchar_t* buf, XP_U16 buflen, const wchar_t* in );
XP_UCHAR* bname( XP_UCHAR* in ); const XP_UCHAR* bname( const XP_UCHAR* in );
#endif #endif

4
wince/cemain.c
View file

@ -698,7 +698,7 @@ ceInitAndStartBoard( CEAppGlobals* globals, XP_Bool newGame, CeGamePrefs* gp,
dict = model_getDictionary( globals->game.model ); dict = model_getDictionary( globals->game.model );
if ( !!dict ) { if ( !!dict ) {
XP_UCHAR* curDictName = dict_getName( dict ); const XP_UCHAR* curDictName = dict_getName( dict );
if ( !!newDictName && if ( !!newDictName &&
( !curDictName || 0 != strcmp( curDictName, newDictName ) ) ) { ( !curDictName || 0 != strcmp( curDictName, newDictName ) ) ) {
dict_destroy( dict ); dict_destroy( dict );
@ -1626,7 +1626,7 @@ ceSaveCurGame( CEAppGlobals* globals, XP_Bool autoSave )
XWStreamCtxt* memStream; XWStreamCtxt* memStream;
DictionaryCtxt* dict; DictionaryCtxt* dict;
FileWriteState fwState; FileWriteState fwState;
char* dictName; const char* dictName;
fwState.path = globals->curGameName; fwState.path = globals->curGameName;
fwState.globals = globals; fwState.globals = globals;