User: crestani Date: 05/03/13 10:21:14 Modified: xemacs/src ChangeLog alloc.c intl-win32.c Log: Fix native Windows build if DEBUG_XEMACS is not defined. * alloc.c (MALLOC_BEGIN): Remove unused parameter. * intl-win32.c (unicode_multibyte_convert_size): Move function call out of assert. Revision Changes Path 1.811 +7 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.810 retrieving revision 1.811 diff -u -r1.810 -r1.811 --- ChangeLog 2005/03/12 11:00:20 1.810 +++ ChangeLog 2005/03/13 09:20:58 1.811 ＠＠ -1,3 +1,10 ＠＠ +2005-03-13 Marcus Crestani <crestani(a)informatik.uni-tuebingen.de&gt; + + Fix native Windows build if DEBUG_XEMACS is not defined. + * alloc.c (MALLOC_BEGIN): Remove unused parameter. + * intl-win32.c (unicode_multibyte_convert_size): Move function + call out of assert. + 2005-03-11 David Robinow <drobinow(a)yahoo.com&gt; * syssignal.h: Configure always sets HAVE_DECL_SYS_SIGLIST. Test 1.109 +1 -1 XEmacs/xemacs/src/alloc.c Index: alloc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- alloc.c 2005/03/11 08:42:36 1.108 +++ alloc.c 2005/03/13 09:21:04 1.109 ＠＠ -349,7 +349,7 ＠＠ #else /* ERROR_CHECK_MALLOC */ -#define MALLOC_BEGIN(block) +#define MALLOC_BEGIN() #define FREE_OR_REALLOC_BEGIN(block) #define MALLOC_END() 1.15 +3 -2 XEmacs/xemacs/src/intl-win32.c Index: intl-win32.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/intl-win32.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- intl-win32.c 2005/01/24 23:34:00 1.14 +++ intl-win32.c 2005/03/13 09:21:04 1.15 ＠＠ -1972,8 +1972,9 ＠＠ Bytecount src_size, int to_unicode, int cp) { alloca_convert_vals vals; - - assert (find_pos_of_existing_active_alloca_convert (srctext) < 0); + + int pos = find_pos_of_existing_active_alloca_convert (srctext); + assert (pos < 0); vals.srctext = srctext;