Changeset: b15d5388f6b3 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b15d5388f6b3 Modified Files: clients/mapiclient/dump.c clients/mapiclient/eventparser.h clients/mapiclient/mclient.c clients/mapiclient/msqldump.c clients/mapiclient/stethoscope.c clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c clients/mapilib/mapi.c clients/mapilib/mapi.h common/stream/stream.h common/utils/msabaoth.c common/utils/mutils.c common/utils/prompt.c gdk/gdk_posix.c gdk/gdk_posix.h gdk/gdk_system.c monetdb5/mal/mal_linker.c monetdb5/mal/mal_sabaoth.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/mdb.h monetdb5/modules/mal/remote.h monetdb_config.h.in sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_upgrades.c sql/server/rel_semantic.c sql/server/sql_parser.y sql/server/sql_scan.c sql/server/sql_semantic.c testing/difflib.c Branch: cmake-fun Log Message:
Include header files only if you have them. diffs (truncated from 491 to 300 lines): diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c --- a/clients/mapiclient/dump.c +++ b/clients/mapiclient/dump.c @@ -10,7 +10,9 @@ #include "monet_options.h" #include "mapi.h" #include "stream.h" +#ifdef HAVE_UNISTD_H #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 @@ -19,12 +19,17 @@ #ifndef _EVENT_PARSER_ #define _EVENT_PARSER_ +#include "monetdb_config.h" #include "mapi.h" #include "stream.h" #include <string.h> +#ifdef HAVE_SYS_STAT_H #include <sys/stat.h> +#endif #include <signal.h> +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif #include <time.h> #define TME_US 1 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,9 @@ # endif #endif #include "mapi.h" +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif #include <string.h> #ifdef HAVE_STRINGS_H #include <strings.h> /* strcasecmp */ diff --git a/clients/mapiclient/msqldump.c b/clients/mapiclient/msqldump.c --- a/clients/mapiclient/msqldump.c +++ b/clients/mapiclient/msqldump.c @@ -15,8 +15,12 @@ # endif #endif #include "mapi.h" -#include <unistd.h> -#include <sys/stat.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif #include <string.h> #include <time.h> diff --git a/clients/mapiclient/stethoscope.c b/clients/mapiclient/stethoscope.c --- a/clients/mapiclient/stethoscope.c +++ b/clients/mapiclient/stethoscope.c @@ -22,7 +22,9 @@ #include "stream_socket.h" #include "mapi.h" #include <string.h> -#include <sys/stat.h> +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif #include <signal.h> #ifdef HAVE_UNISTD_H # include <unistd.h> diff --git a/clients/mapiclient/tachograph.c b/clients/mapiclient/tachograph.c --- a/clients/mapiclient/tachograph.c +++ b/clients/mapiclient/tachograph.c @@ -18,7 +18,9 @@ #include "stream_socket.h" #include "mapi.h" #include <string.h> +#ifdef HAVE_SYS_STAT_H #include <sys/stat.h> +#endif #include <signal.h> #ifdef HAVE_UNISTD_H # include <unistd.h> diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c --- a/clients/mapiclient/tomograph.c +++ b/clients/mapiclient/tomograph.c @@ -22,10 +22,12 @@ #include "stream_socket.h" #include "mapi.h" #include <string.h> +#ifdef HAVE_SYS_STAT_H #include <sys/stat.h> +#endif #include <signal.h> #ifdef HAVE_UNISTD_H -# include <unistd.h> +#include <unistd.h> #endif #include "mprompt.h" #include "dotmonetdb.h" diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c --- a/clients/mapilib/mapi.c +++ b/clients/mapilib/mapi.c @@ -695,7 +695,9 @@ #ifdef HAVE_PWD_H #include <pwd.h> #endif -#include <sys/types.h> +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif #ifdef HAVE_SYS_UN_H # include <sys/un.h> diff --git a/clients/mapilib/mapi.h b/clients/mapilib/mapi.h --- a/clients/mapilib/mapi.h +++ b/clients/mapilib/mapi.h @@ -9,6 +9,7 @@ #ifndef _MAPI_H_INCLUDED #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 */ diff --git a/common/stream/stream.h b/common/stream/stream.h --- a/common/stream/stream.h +++ b/common/stream/stream.h @@ -21,7 +21,10 @@ * required for proper conversion on different byte order platforms. */ -#include <unistd.h> +#include "monetdb_config.h" +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif #include <ctype.h> #include <stdio.h> diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c --- a/common/utils/msabaoth.c +++ b/common/utils/msabaoth.c @@ -18,13 +18,21 @@ */ #include "monetdb_config.h" -#include <unistd.h> /* unlink and friends */ +#ifdef HAVE_UNISTD_H +#include <unistd.h> /* unlink and friends */ +#endif +#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> +#endif #ifdef HAVE_DIRENT_H #include <dirent.h> /* readdir, DIR */ #endif +#ifdef HAVE_SYS_STAT_H #include <sys/stat.h> +#endif +#ifdef HAVE_FCNTL_H #include <fcntl.h> +#endif #include <time.h> #include <string.h> /* for getting error messages */ #include <stddef.h> diff --git a/common/utils/mutils.c b/common/utils/mutils.c --- a/common/utils/mutils.c +++ b/common/utils/mutils.c @@ -7,10 +7,18 @@ */ #include "monetdb_config.h" +#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> +#endif +#ifdef HAVE_SYS_STAT_H #include <sys/stat.h> +#endif +#ifdef HAVE_FCNTL_H #include <fcntl.h> +#endif +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif #include <string.h> #include "mutils.h" diff --git a/common/utils/prompt.c b/common/utils/prompt.c --- a/common/utils/prompt.c +++ b/common/utils/prompt.c @@ -7,7 +7,9 @@ */ #include "monetdb_config.h" +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif #include <string.h> #ifndef _MSC_VER #ifdef HAVE_TERMIOS_H diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c --- a/gdk/gdk_posix.c +++ b/gdk/gdk_posix.c @@ -19,7 +19,9 @@ #include "gdk.h" /* includes gdk_posix.h */ #include "gdk_private.h" #include "mutils.h" +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif #include <string.h> /* strncpy */ #ifdef HAVE_FCNTL_H diff --git a/gdk/gdk_posix.h b/gdk/gdk_posix.h --- a/gdk/gdk_posix.h +++ b/gdk/gdk_posix.h @@ -9,7 +9,9 @@ #ifndef GDK_POSIX_H #define GDK_POSIX_H +#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> +#endif #include <time.h> diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c --- a/gdk/gdk_system.c +++ b/gdk/gdk_system.c @@ -43,7 +43,9 @@ #include <signal.h> #include <string.h> /* for strerror */ -#include <unistd.h> /* for sysconf symbols */ +#ifdef HAVE_UNISTD_H +#include <unistd.h> /* for sysconf symbols */ +#endif #ifdef LOCK_STATS diff --git a/monetdb5/mal/mal_linker.c b/monetdb5/mal/mal_linker.c --- a/monetdb5/mal/mal_linker.c +++ b/monetdb5/mal/mal_linker.c @@ -18,14 +18,18 @@ #include "mal_private.h" #include "mutils.h" +#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> /* opendir */ +#endif #ifdef HAVE_DIRENT_H #include <dirent.h> #endif #ifdef HAVE_FCNTL_H #include <fcntl.h> #endif +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif #if defined(_MSC_VER) && _MSC_VER >= 1400 #define open _open diff --git a/monetdb5/mal/mal_sabaoth.c b/monetdb5/mal/mal_sabaoth.c --- a/monetdb5/mal/mal_sabaoth.c +++ b/monetdb5/mal/mal_sabaoth.c @@ -19,12 +19,18 @@ */ #include "monetdb_config.h" #include "mal_sabaoth.h" -#include <unistd.h> /* unlink and friends */ +#ifdef HAVE_UNISTD_H +#include <unistd.h> /* unlink and friends */ +#endif +#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> +#endif #ifdef HAVE_DIRENT_H #include <dirent.h> /* readdir, DIR */ #endif +#ifdef HAVE_SYS_STAT_H #include <sys/stat.h> +#endif #include <string.h> /* for getting error messages */ #if defined(_MSC_VER) && _MSC_VER >= 1400 diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c --- a/monetdb5/modules/mal/mal_mapi.c +++ b/monetdb5/modules/mal/mal_mapi.c @@ -31,7 +31,9 @@ #include "monetdb_config.h" _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
