Changeset: b5f7648f4428 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b5f7648f4428
Modified Files:
clients/mapiclient/dotmonetdb.c
clients/mapiclient/dump.c
clients/mapiclient/eventparser.h
clients/mapiclient/mclient.c
clients/mapiclient/mhelp.c
clients/mapiclient/msqldump.c
clients/mapiclient/prompt.c
clients/mapiclient/stethoscope.c
clients/mapiclient/tachograph.c
clients/mapiclient/tomograph.c
clients/mapilib/mapi.c
clients/mapilib/mapi.h
clients/odbc/driver/ODBCGlobal.h
clients/odbc/driver/SQLDriverConnect.c
clients/odbc/setup/drvcfg.c
clients/odbc/winsetup/install.c
common/options/getopt1.c
common/options/monet_options.c
common/stream/stream.c
common/utils/mcrypt.c
common/utils/msabaoth.c
common/utils/mutils.c
common/utils/muuid.c
common/utils/revision.c
gdk/gdk_interprocess.c
gdk/gdk_interprocess.h
gdk/gdk_logger.c
gdk/gdk_posix.c
gdk/gdk_system.c
geom/monetdb5/geom.h
monetdb5/extras/rapi/rapi.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_sabaoth.c
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/str.c
monetdb5/modules/atoms/strptime.c
monetdb5/modules/kernel/batcolor.h
monetdb5/modules/kernel/batstr.c
monetdb5/modules/mal/manifold.h
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/txtsim.h
monetdb_config.h.in
sql/backends/monet5/UDF/capi/capi.c
sql/backends/monet5/UDF/pyapi/unicode.c
sql/backends/monet5/UDF/udf/udf.h
sql/backends/monet5/sql_statement.c
sql/backends/monet5/vaults/bam/bam_globals.h
sql/backends/monet5/vaults/shp/shp.c
sql/common/sql_list.c
sql/common/sql_types.c
sql/server/rel_semantic.c
sql/server/sql_parser.y
sql/server/sql_scan.c
sql/server/sql_semantic.c
testing/Mdiff.c
testing/difflib.c
testing/helpers.c
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/argvcmds.c
tools/merovingian/daemon/client.c
tools/merovingian/daemon/connections.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/discoveryrunner.c
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/handlers.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/daemon/multiplex-funnel.c
tools/merovingian/daemon/proxy.c
tools/merovingian/utils/control.c
tools/merovingian/utils/database.c
tools/merovingian/utils/properties.c
tools/merovingian/utils/utils.c
tools/mserver/mserver5.c
tools/mserver/shutdowntest.c
Branch: cmake-fun
Log Message:
Moved string.h include to monetdb_config.h.in
On msvc we define strdup as macro to _strdup function. However by doing this
before including <string.h> gives a compilation error.
diffs (truncated from 849 to 300 lines):
diff --git a/clients/mapiclient/dotmonetdb.c b/clients/mapiclient/dotmonetdb.c
--- a/clients/mapiclient/dotmonetdb.c
+++ b/clients/mapiclient/dotmonetdb.c
@@ -8,7 +8,6 @@
#include "monetdb_config.h"
#include "dotmonetdb.h"
-#include <string.h>
void
parse_dotmonetdb(char **user, char **passwd, char **dbname, char **language,
int *save_history, char **output, int *pagewidth)
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -12,7 +12,6 @@
#ifndef NATIVE_WIN32
#include <unistd.h>
#endif
-#include <string.h>
#include <ctype.h>
#include "msqldump.h"
diff --git a/clients/mapiclient/eventparser.h b/clients/mapiclient/eventparser.h
--- a/clients/mapiclient/eventparser.h
+++ b/clients/mapiclient/eventparser.h
@@ -22,7 +22,6 @@
#include "monetdb_config.h"
#include "mapi.h"
#include "stream.h"
-#include <string.h>
#include <sys/stat.h>
#include <signal.h>
#ifndef NATIVE_WIN32
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -22,7 +22,6 @@
# endif
#endif
#include "mapi.h"
-#include <string.h>
#ifdef NATIVE_WIN32
# include <io.h>
#else
diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c
--- a/clients/mapiclient/mhelp.c
+++ b/clients/mapiclient/mhelp.c
@@ -26,7 +26,6 @@
#include "monetdb_config.h"
#include <ctype.h>
-#include <string.h>
#ifndef NATIVE_WIN32
#include <strings.h> /* for strncasecmp */
#endif
diff --git a/clients/mapiclient/msqldump.c b/clients/mapiclient/msqldump.c
--- a/clients/mapiclient/msqldump.c
+++ b/clients/mapiclient/msqldump.c
@@ -19,7 +19,6 @@
# include <unistd.h>
#endif
#include <sys/stat.h>
-#include <string.h>
#include <time.h>
#include "stream.h"
diff --git a/clients/mapiclient/prompt.c b/clients/mapiclient/prompt.c
--- a/clients/mapiclient/prompt.c
+++ b/clients/mapiclient/prompt.c
@@ -7,7 +7,6 @@
*/
#include "monetdb_config.h"
-#include <string.h>
#ifndef NATIVE_WIN32
#include <termios.h>
#include <unistd.h>
diff --git a/clients/mapiclient/stethoscope.c b/clients/mapiclient/stethoscope.c
--- a/clients/mapiclient/stethoscope.c
+++ b/clients/mapiclient/stethoscope.c
@@ -20,7 +20,6 @@
#include "stream.h"
#include "stream_socket.h"
#include "mapi.h"
-#include <string.h>
#include <sys/stat.h>
#include <signal.h>
#ifdef HAVE_UNISTD_H
diff --git a/clients/mapiclient/tachograph.c b/clients/mapiclient/tachograph.c
--- a/clients/mapiclient/tachograph.c
+++ b/clients/mapiclient/tachograph.c
@@ -16,7 +16,6 @@
#include "stream.h"
#include "stream_socket.h"
#include "mapi.h"
-#include <string.h>
#include <sys/stat.h>
#include <signal.h>
#ifdef NATIVE_WIN32
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -20,7 +20,6 @@
#include "stream.h"
#include "stream_socket.h"
#include "mapi.h"
-#include <string.h>
#include <sys/stat.h>
#include <signal.h>
#ifdef NATIVE_WIN32
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -703,7 +703,6 @@
#endif
#include <signal.h>
-#include <string.h>
#include <time.h>
#ifdef HAVE_FTIME
# include <sys/timeb.h> /* ftime */
diff --git a/clients/mapilib/mapi.h b/clients/mapilib/mapi.h
--- a/clients/mapilib/mapi.h
+++ b/clients/mapilib/mapi.h
@@ -10,9 +10,7 @@
#define _MAPI_H_INCLUDED 1
#include "monetdb_config.h"
-#include <stdio.h> /* for FILE * */
#include <stdint.h> /* for int64_t */
-#include <stdbool.h> /* for bool */
#define MAPI_AUTO 0 /* automatic type detection */
#define MAPI_TINY 1
diff --git a/clients/odbc/driver/ODBCGlobal.h b/clients/odbc/driver/ODBCGlobal.h
--- a/clients/odbc/driver/ODBCGlobal.h
+++ b/clients/odbc/driver/ODBCGlobal.h
@@ -66,7 +66,6 @@
#include <odbcinst.h> /* ODBC installer definitions and prototypes */
/* standard C include files */
-#include <string.h> /* for strcpy() etc. */
#include <ctype.h>
#ifdef SQLLEN /* it's a define for 32, a typedef for 64 */
diff --git a/clients/odbc/driver/SQLDriverConnect.c
b/clients/odbc/driver/SQLDriverConnect.c
--- a/clients/odbc/driver/SQLDriverConnect.c
+++ b/clients/odbc/driver/SQLDriverConnect.c
@@ -30,8 +30,6 @@
#include "ODBCUtil.h"
#ifndef NATIVE_WIN32
#include <strings.h> /* for strcasecmp */
-#else
-#include <string.h>
#endif
int
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
@@ -21,7 +21,6 @@
#include "monetdb_config.h"
#include "drvcfg.h"
-#include <string.h> /* for memset(), memcpy(), strncpy() */
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
@@ -9,7 +9,6 @@
#include "ODBCGlobal.h"
#include <winver.h>
#include <shlwapi.h>
-#include <string.h>
#ifdef __MINGW32__
#define DLL "-0.dll"
diff --git a/common/options/getopt1.c b/common/options/getopt1.c
--- a/common/options/getopt1.c
+++ b/common/options/getopt1.c
@@ -81,8 +81,6 @@ getopt_long_only(int argc, char *const *
#ifdef TEST
-#include <stdio.h>
-
int
main(argc, argv)
int argc;
diff --git a/common/options/monet_options.c b/common/options/monet_options.c
--- a/common/options/monet_options.c
+++ b/common/options/monet_options.c
@@ -27,7 +27,6 @@
# include "getopt.h"
# endif
#endif
-#include <string.h>
#include <ctype.h>
#ifndef HAVE_GETOPT_LONG
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -54,7 +54,6 @@
#include "stream_socket.h"
#include "matomic.h"
-#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/common/utils/mcrypt.c b/common/utils/mcrypt.c
--- a/common/utils/mcrypt.c
+++ b/common/utils/mcrypt.c
@@ -8,7 +8,6 @@
#include "monetdb_config.h"
#include "mcrypt.h"
-#include <string.h>
#ifndef HAVE_EMBEDDED
/* only provide digest functions if not embedded */
diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -28,8 +28,6 @@
#include <dirent.h> /* readdir, DIR */
#endif
#include <time.h>
-#include <string.h> /* for getting error messages */
-#include <stddef.h>
#include <ctype.h>
#include "msabaoth.h"
diff --git a/common/utils/mutils.c b/common/utils/mutils.c
--- a/common/utils/mutils.c
+++ b/common/utils/mutils.c
@@ -9,7 +9,6 @@
#include "monetdb_config.h"
#include <sys/types.h>
#include <sys/stat.h>
-#include <string.h>
#include <fcntl.h>
#ifdef NATIVE_WIN32
#include <io.h>
diff --git a/common/utils/muuid.c b/common/utils/muuid.c
--- a/common/utils/muuid.c
+++ b/common/utils/muuid.c
@@ -11,7 +11,6 @@
#include "monetdb_config.h"
#include "muuid.h"
-#include <string.h> /* strdup */
#ifdef HAVE_UUID
# include <uuid/uuid.h>
#endif
diff --git a/common/utils/revision.c b/common/utils/revision.c
--- a/common/utils/revision.c
+++ b/common/utils/revision.c
@@ -7,7 +7,6 @@
*/
#include "monetdb_config.h"
-#include <string.h>
#include "mutils.h"
static const char revision[] =
diff --git a/gdk/gdk_interprocess.c b/gdk/gdk_interprocess.c
--- a/gdk/gdk_interprocess.c
+++ b/gdk/gdk_interprocess.c
@@ -14,8 +14,6 @@
#include "gdk.h"
#include "gdk_private.h"
-#include <string.h>
-
#include <sys/types.h>
#include <sys/ipc.h>
#include <sys/shm.h>
diff --git a/gdk/gdk_interprocess.h b/gdk/gdk_interprocess.h
--- a/gdk/gdk_interprocess.h
+++ b/gdk/gdk_interprocess.h
@@ -17,8 +17,6 @@
#ifdef HAVE_FORK
#include "gdk.h"
-#include <stddef.h>
-
//! Obtain a set of unique identifiers that can be used to create memory
mapped files or semaphores
gdk_export size_t GDKuniqueid(size_t offset);
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -57,7 +57,6 @@
#include "gdk.h"
#include "gdk_private.h"
#include "gdk_logger.h"
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
