Changeset: edae8e97dccf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=edae8e97dccf
Modified Files:
NT/monetdb_config.h.in
clients/mapiclient/dotmonetdb.c
clients/mapiclient/mclient.c
clients/mapilib/mapi.c
clients/odbc/driver/SQLBrowseConnect.c
clients/odbc/driver/SQLConnect.c
clients/odbc/driver/SQLFetch.c
clients/odbc/setup/drvcfg.c
clients/odbc/winsetup/install.c
common/utils/mcrypt.c
common/utils/mutils.c
configure.ag
gdk/gdk.h
gdk/gdk_posix.h
monetdb5/mal/mal_readline.c
monetdb5/modules/mal/txtsim.h
Branch: default
Log Message:
Some cleanup of include files.
diffs (274 lines):
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -33,14 +33,12 @@
#define _CRT_SECURE_NO_DEPRECATE 1
#endif
-#include <malloc.h>
-
+#include <stdlib.h>
#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
/* In this case, malloc and friends are redefined in crtdbg.h to debug
versions. We need to include stdlib.h and malloc.h first or else
we get conflicting declarations.
*/
-#include <stdlib.h>
#include <crtdbg.h>
#endif
@@ -51,7 +49,6 @@
#include <sys/types.h>
#include <stdio.h> /* NULL, printf etc. */
-#include <stdlib.h>
#include <errno.h>
#include <stdarg.h> /* va_alist.. */
@@ -331,9 +328,6 @@
/* Define to 1 if you have the `madvise' function. */
/* #undef HAVE_MADVISE */
-/* Define to 1 if you have the <malloc.h> header file. */
-#define HAVE_MALLOC_H 1
-
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
@@ -639,9 +633,6 @@
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1 /* generate by the Makefile */
-/* Define if you have mallinfo */
-/* #undef HAVE_USEFUL_MALLINFO */
-
/* Define if you have the LibUriParser library */
/* #undef HAVE_URIPARSER */
@@ -828,9 +819,6 @@
STACK_DIRECTION = 0 => direction of growth unknown */
/* #undef STACK_DIRECTION */
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
/* read-only single-machine data */
#define SYSCONFDIR PREFIX "\\etc"
diff --git a/clients/mapiclient/dotmonetdb.c b/clients/mapiclient/dotmonetdb.c
--- a/clients/mapiclient/dotmonetdb.c
+++ b/clients/mapiclient/dotmonetdb.c
@@ -9,12 +9,7 @@
#include "monetdb_config.h"
#include "dotmonetdb.h"
#include <stdio.h>
-#ifdef HAVE_STRING_H
#include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
void
parse_dotmonetdb(char **user, char **passwd, char **dbname, char **language,
int *save_history, char **output, int *pagewidth)
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -30,12 +30,9 @@
#include <string.h>
#endif
#ifdef HAVE_STRINGS_H
-#include <strings.h>
+#include <strings.h> /* strcasecmp */
#endif
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
#ifdef HAVE_LIBREADLINE
#include <readline/readline.h>
#include <readline/history.h>
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -744,10 +744,6 @@
# include <sys/uio.h>
#endif
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
#include <signal.h>
#include <string.h>
#include <memory.h>
diff --git a/clients/odbc/driver/SQLBrowseConnect.c
b/clients/odbc/driver/SQLBrowseConnect.c
--- a/clients/odbc/driver/SQLBrowseConnect.c
+++ b/clients/odbc/driver/SQLBrowseConnect.c
@@ -29,7 +29,7 @@
#include "ODBCDbc.h"
#include "ODBCUtil.h"
#ifdef HAVE_STRINGS_H
-#include <strings.h>
+#include <strings.h> /* strcasecmp */
#endif
#ifdef HAVE_ODBCINST_H
diff --git a/clients/odbc/driver/SQLConnect.c b/clients/odbc/driver/SQLConnect.c
--- a/clients/odbc/driver/SQLConnect.c
+++ b/clients/odbc/driver/SQLConnect.c
@@ -29,9 +29,6 @@
#include "ODBCDbc.h"
#include "ODBCUtil.h"
#include <monet_options.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
#ifdef HAVE_TIME_H
#include <time.h>
#endif
diff --git a/clients/odbc/driver/SQLFetch.c b/clients/odbc/driver/SQLFetch.c
--- a/clients/odbc/driver/SQLFetch.c
+++ b/clients/odbc/driver/SQLFetch.c
@@ -28,10 +28,6 @@
#include "ODBCGlobal.h"
#include "ODBCStmt.h"
#include "ODBCUtil.h"
-#include <time.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h> /* for strncasecmp */
-#endif
SQLRETURN
MNDBFetch(ODBCStmt *stmt, SQLUSMALLINT *RowStatusArray)
diff --git a/clients/odbc/setup/drvcfg.c b/clients/odbc/setup/drvcfg.c
--- a/clients/odbc/setup/drvcfg.c
+++ b/clients/odbc/setup/drvcfg.c
@@ -24,9 +24,6 @@
#include <string.h> /* for memset(), memcpy(), strncpy() */
#include <stdlib.h> /* for malloc() on Darwin */
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
static const char *aHost[] = {
"localhost",
diff --git a/clients/odbc/winsetup/install.c b/clients/odbc/winsetup/install.c
--- a/clients/odbc/winsetup/install.c
+++ b/clients/odbc/winsetup/install.c
@@ -11,7 +11,7 @@
#include <shlwapi.h>
#include <string.h>
#include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
#ifdef __MINGW32__
#define DLL "-0.dll"
diff --git a/common/utils/mcrypt.c b/common/utils/mcrypt.c
--- a/common/utils/mcrypt.c
+++ b/common/utils/mcrypt.c
@@ -7,9 +7,6 @@
*/
#include "monetdb_config.h"
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
#include "mcrypt.h"
#include <string.h>
diff --git a/common/utils/mutils.c b/common/utils/mutils.c
--- a/common/utils/mutils.c
+++ b/common/utils/mutils.c
@@ -12,9 +12,6 @@
#include <fcntl.h>
#include <unistd.h>
#include <stdlib.h>
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
#include "mutils.h"
#if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE)
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2545,7 +2545,6 @@ AC_CHECK_HEADERS([ \
mach/mach_init.h \
mach/task.h \
mach-o/dyld.h \
- malloc.h \
netdb.h \
netinet/in.h \
procfs.h \
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -313,23 +313,9 @@
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H)
-# include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
#else
diff --git a/gdk/gdk_posix.h b/gdk/gdk_posix.h
--- a/gdk/gdk_posix.h
+++ b/gdk/gdk_posix.h
@@ -11,10 +11,6 @@
#include <sys/types.h>
-#ifdef HAVE_MALLOC_H
-# include <malloc.h>
-#endif
-
#ifdef HAVE_FTIME
#include <sys/timeb.h>
#endif
diff --git a/monetdb5/mal/mal_readline.c b/monetdb5/mal/mal_readline.c
--- a/monetdb5/mal/mal_readline.c
+++ b/monetdb5/mal/mal_readline.c
@@ -13,9 +13,6 @@
#include "mal_scenario.h"
#include "mal_readline.h"
#include "mal_debugger.h"
-#ifdef HAVE_STRINGS_H
-#include <strings.h> /* for strncasecmp */
-#endif
#ifndef S_ISCHR
#define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR)
diff --git a/monetdb5/modules/mal/txtsim.h b/monetdb5/modules/mal/txtsim.h
--- a/monetdb5/modules/mal/txtsim.h
+++ b/monetdb5/modules/mal/txtsim.h
@@ -16,8 +16,6 @@
#include "mal.h"
#include <string.h>
#include "gdk.h"
-#ifdef HAVE_MALLOC_H
-#endif
#include <stdio.h>
#include <stdlib.h>
#include <limits.h>
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
