Mercurial > hg > xemacs-beta
changeset 2658:a48989ca6db3
[xemacs-hg @ 2005-03-13 09:20:58 by crestani]
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.
| author | crestani |
|---|---|
| date | Sun, 13 Mar 2005 09:21:04 +0000 |
| parents | 48e27e1d7e63 |
| children | 674ee2dfe5fc |
| files | src/ChangeLog src/alloc.c src/intl-win32.c |
| diffstat | 3 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Mar 12 22:51:30 2005 +0000 +++ b/src/ChangeLog Sun Mar 13 09:21:04 2005 +0000 @@ -1,3 +1,10 @@ +2005-03-13 Marcus Crestani <crestani@informatik.uni-tuebingen.de> + + 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@yahoo.com> * syssignal.h: Configure always sets HAVE_DECL_SYS_SIGLIST. Test
--- a/src/alloc.c Sat Mar 12 22:51:30 2005 +0000 +++ b/src/alloc.c Sun Mar 13 09:21:04 2005 +0000 @@ -349,7 +349,7 @@ #else /* ERROR_CHECK_MALLOC */ -#define MALLOC_BEGIN(block) +#define MALLOC_BEGIN() #define FREE_OR_REALLOC_BEGIN(block) #define MALLOC_END()
--- a/src/intl-win32.c Sat Mar 12 22:51:30 2005 +0000 +++ b/src/intl-win32.c Sun Mar 13 09:21:04 2005 +0000 @@ -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;