From 0cc69e7d42e9d83dc424a4dc5cab803ec9c4ddef Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 3 Mar 2007 11:03:50 +0000 Subject: [PATCH] Fix last change. Indent the patch for assert.h one column. --- etc/PROBLEMS | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/etc/PROBLEMS b/etc/PROBLEMS index 4461018b3da..c47552e3654 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -2439,11 +2439,31 @@ This might happen due to a bug in the MinGW header assert.h, which defines the `assert' macro with a trailing semi-colon. The following patch to assert.h should solve this: + *** include/assert.h.orig Sun Nov 7 02:41:36 1999 + --- include/assert.h Mon Jan 29 11:49:10 2001 + *************** + *** 41,47 **** + /* + * If not debugging, assert does nothing. + */ + ! #define assert(x) ((void)0); + + #else /* debugging enabled */ + + --- 41,47 ---- + /* + * If not debugging, assert does nothing. + */ + ! #define assert(x) ((void)0) + + #else /* debugging enabled */ + + *** Building the MS-Windows port with Visual Studio 2005 fails. Microsoft no longer ships the single threaded version of the C library with their compiler, and the multithreaded static library is missing -some functions that Microsoft have deemed non-threadsafe. The +some functions that Microsoft have deemed non-threadsafe. The dynamically linked C library has all the functions, but there is a conflict between the versions of malloc in the DLL and in Emacs, which is not resolvable due to the way Windows does dynamic linking. @@ -2452,26 +2472,6 @@ We recommend the use of the MingW port of GCC for compiling Emacs, as not only does it not suffer these problems, but it is also Free software like Emacs. -*** include/assert.h.orig Sun Nov 7 02:41:36 1999 ---- include/assert.h Mon Jan 29 11:49:10 2001 -*************** -*** 41,47 **** - /* - * If not debugging, assert does nothing. - */ -! #define assert(x) ((void)0); - - #else /* debugging enabled */ - ---- 41,47 ---- - /* - * If not debugging, assert does nothing. - */ -! #define assert(x) ((void)0) - - #else /* debugging enabled */ - - ** Linking *** Building Emacs with a system compiler fails to link because of an -- 2.39.5