From 6cf309222455818c0a6c13dffff5da7f6419910a Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 28 Jun 2004 00:42:02 +0300 Subject: Added missing my_time.c file to mysqlclient project Moved include to my_global.h VC++Files/client/mysqlclient.dsp: Added missing my_time.c file to mysqlclient project include/my_dbug.h: Moved include to my_global.h Removed NDEBUG as asserts should be indenpendent of if we are using DBUG or not include/my_global.h: Added assert.h as this is included in a lot of places sql/sql_table.cc: Initialize forgotten variable --- include/my_dbug.h | 5 +---- include/my_global.h | 7 +++++++ 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/my_dbug.h b/include/my_dbug.h index bc90b91f1c7..9174a8b1ef9 100644 --- a/include/my_dbug.h +++ b/include/my_dbug.h @@ -16,10 +16,7 @@ #ifndef _dbug_h #define _dbug_h -#ifdef DBUG_OFF -#define NDEBUG /* for assert.h */ -#endif -#include + #ifdef __cplusplus extern "C" { #endif diff --git a/include/my_global.h b/include/my_global.h index 478bfcfdbb7..f5c14ea3e10 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -313,6 +313,13 @@ C_MODE_END #include #endif +/* + A lot of our programs uses asserts, so better to always include it + This also fixes a problem when people uses DBUG_ASSERT without including + assert.h +*/ +#include + /* Go around some bugs in different OS and compilers */ #if defined(_HPUX_SOURCE) && defined(HAVE_SYS_STREAM_H) #include /* HPUX 10.20 defines ulong here. UGLY !!! */ -- cgit v1.2.1