User: vins Date: 06/03/21 04:12:50 Branch: xemacs/src release-21-4 Modified: xemacs/src ChangeLog dialog-msw.c glyphs-msw.c Log: Changes necessary to get 21.4 to compile under gcc-4.1.0 on Cygwin. Revision Changes Path 1.290.2.108 +9 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.290.2.107 retrieving revision 1.290.2.108 diff -u -p -r1.290.2.107 -r1.290.2.108 --- ChangeLog 2006/01/29 00:00:37 1.290.2.107 +++ ChangeLog 2006/03/21 03:12:29 1.290.2.108 ＠＠ -1,3 +1,12 ＠＠ +2006-03-17 Vin Shelton <acs(a)xemacs.org&gt; + + * dialog-msw.c (handle_directory_dialog_box): Don't declare + Q_title here. LOCAL_FILE_FORMAT_TO_TSTR requires an lvalue. + + * glyphs-msw.c (read_bitmap_data): change 'initialized' to + 'hex_initialized' because it conflicts with 'initialized' in + lisp.h. + 2006-01-28 Vin Shelton <acs(a)xemacs.org&gt; * XEmacs 21.4.19 is released 1.7.2.4 +3 -1 XEmacs/xemacs/src/dialog-msw.c Index: dialog-msw.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/dialog-msw.c,v retrieving revision 1.7.2.3 retrieving revision 1.7.2.4 diff -u -p -r1.7.2.3 -r1.7.2.4 --- dialog-msw.c 2002/08/20 11:36:47 1.7.2.3 +++ dialog-msw.c 2006/03/21 03:12:39 1.7.2.4 ＠＠ -42,7 +42,9 ＠＠ Lisp_Object Qdialog_box_error; static Lisp_Object Q_initial_directory; static Lisp_Object Q_initial_filename; static Lisp_Object Q_filter_list; +/* Declared in general-slots.h static Lisp_Object Q_title; +*/ static Lisp_Object Q_allow_multi_select; static Lisp_Object Q_create_prompt_on_nonexistent; static Lisp_Object Q_overwrite_prompt; ＠＠ -400,7 +402,7 ＠＠ handle_directory_dialog_box (struct fram bi.lpfn = handle_directory_proc; LOCAL_FILE_FORMAT_TO_TSTR (Fexpand_file_name (build_string (""), Qnil), - (char*)pd.fname); + pd.fname); { EXTERNAL_PROPERTY_LIST_LOOP_3 (key, value, keys) 1.28.2.5 +3 -3 XEmacs/xemacs/src/glyphs-msw.c Index: glyphs-msw.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-msw.c,v retrieving revision 1.28.2.4 retrieving revision 1.28.2.5 diff -u -p -r1.28.2.4 -r1.28.2.5 --- glyphs-msw.c 2005/01/31 02:55:18 1.28.2.4 +++ glyphs-msw.c 2006/03/21 03:12:40 1.28.2.5 ＠＠ -1460,7 +1460,7 ＠＠ in this Software without prior written a /* shared data for the image read/parse logic */ static short hexTable[256]; /* conversion value */ -static int initialized = FALSE; /* easier to fill in at run time */ +static int hex_initialized = FALSE; /* easier to fill in at run time */ /* * Table index for the hex values. Initialized once, first time. ＠＠ -1494,7 +1494,7 ＠＠ initHexTable (void) hexTable['}'] = -1; hexTable['\n'] = -1; hexTable['\t'] = -1; - initialized = TRUE; + hex_initialized = TRUE; } /* ＠＠ -1557,7 +1557,7 ＠＠ int read_bitmap_data (FILE* fstream, uns #define Xmalloc(size) malloc(size) /* first time initialization */ - if (initialized == FALSE) initHexTable(); + if (hex_initialized == FALSE) initHexTable(); /* error cleanup and return macro */ #define RETURN(code) { if (data) free (data); return code; }