From 4208c33ecf57bdd4f8b9376f6cbb1e54750f8ed1 Mon Sep 17 00:00:00 2001 From: Andy2 Date: Wed, 25 Aug 2010 06:31:38 -0700 Subject: [PATCH] make lang code support non-conditional --- xwords4/common/dictnry.c | 2 -- xwords4/common/dictnry.h | 4 ---- 2 files changed, 6 deletions(-) diff --git a/xwords4/common/dictnry.c b/xwords4/common/dictnry.c index 859f124f1..3a3b04b4e 100644 --- a/xwords4/common/dictnry.c +++ b/xwords4/common/dictnry.c @@ -431,13 +431,11 @@ dict_getFaceBitmaps( const DictionaryCtxt* dict, Tile tile, XP_Bitmaps* bmps ) bmps->bmps[1] = bitmaps->largeBM; } /* dict_getFaceBitmaps */ -#ifdef TALL_FONTS XP_LangCode dict_getLangCode( const DictionaryCtxt* dict ) { return dict->langCode; } -#endif #ifdef STUBBED_DICT diff --git a/xwords4/common/dictnry.h b/xwords4/common/dictnry.h index e2bbc8d01..ff088b60d 100644 --- a/xwords4/common/dictnry.h +++ b/xwords4/common/dictnry.h @@ -79,9 +79,7 @@ struct DictionaryCtxt { SpecialBitmaps* bitmaps; XP_UCHAR** chars; -#ifdef TALL_FONTS XP_LangCode langCode; -#endif XP_U8 nFaces; #ifdef NODE_CAN_4 @@ -150,9 +148,7 @@ XP_Bool dict_faceIsBitmap( const DictionaryCtxt* dict, Tile tile ); void dict_getFaceBitmaps( const DictionaryCtxt* dict, Tile tile, XP_Bitmaps* bmps ); -#ifdef TALL_FONTS XP_LangCode dict_getLangCode( const DictionaryCtxt* dict ); -#endif void dict_writeToStream( const DictionaryCtxt* ctxt, XWStreamCtxt* stream ); void dict_loadFromStream( DictionaryCtxt* dict, XWStreamCtxt* stream );