Changeset: 19d31622c950 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=19d31622c950
Modified Files:
Branch: default
Log Message:
Merge heads.
diffs (171 lines):
diff -r 3094b7c8d161 -r 19d31622c950 MonetDB/configure.ag
--- a/MonetDB/configure.ag Sun Nov 28 22:29:40 2010 +0100
+++ b/MonetDB/configure.ag Tue Nov 30 10:58:20 2010 +0100
@@ -107,8 +107,8 @@
[AC_DEFINE([HAVE_FDATASYNC],[1],[If the system has a working fdatasync])])
AC_FUNC_MEMCMP
-AC_CHECK_FUNCS([memset fcntl ftime getopt getrlimit getuid kill \
- lockf nanosleep pipe setenv shutdown strdup strtof uname \
+AC_CHECK_FUNCS([fcntl ftime getopt getrlimit getuid kill \
+ lockf pipe setenv shutdown strdup strtof uname \
strtoll fsync])
diff -r 3094b7c8d161 -r 19d31622c950 MonetDB/src/gdk/gdk_posix.mx
--- a/MonetDB/src/gdk/gdk_posix.mx Sun Nov 28 22:29:40 2010 +0100
+++ b/MonetDB/src/gdk/gdk_posix.mx Tue Nov 30 10:58:20 2010 +0100
@@ -289,7 +289,6 @@
#define NAME_MAX 255
-#ifndef HAVE_OPENDIR
struct DIR {
char *dir_name;
int just_opened;
@@ -302,17 +301,14 @@
char d_name[NAME_MAX + 1];
int d_namelen;
};
-#endif
#ifndef HAVE_FTRUNCATE
gdk_export int ftruncate(int fd, off_t size);
#endif
-#ifndef HAVE_OPENDIR
gdk_export DIR *opendir(const char *dirname);
gdk_export struct direct *readdir(DIR *dir);
gdk_export void rewinddir(DIR *dir);
gdk_export int closedir(DIR *dir);
-#endif
#endif
@@ -1681,7 +1677,6 @@
}
#endif
-#ifndef HAVE_OPENDIR
DIR *
opendir(const char *dirname)
{
@@ -1805,7 +1800,6 @@
return 0;
}
-#endif /* HAVE_OPENDIR */
#ifndef HAVE_GETTIMEOFDAY
static int nodays[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
diff -r 3094b7c8d161 -r 19d31622c950 MonetDB4/configure.ag
--- a/MonetDB4/configure.ag Sun Nov 28 22:29:40 2010 +0100
+++ b/MonetDB4/configure.ag Tue Nov 30 10:58:20 2010 +0100
@@ -312,16 +312,15 @@
fi
AC_FUNC_MEMCMP()
AC_CHECK_FUNCS(strsignal)
-AC_CHECK_FUNCS(mkdir rmdir getcwd getopt getrlimit kill pipe setsid)
-AC_CHECK_FUNCS(strcspn strdup strstr strtod strtol strerror strcasecmp
strncasecmp)
+AC_CHECK_FUNCS(getopt getrlimit kill pipe setsid)
+AC_CHECK_FUNCS(strdup strtod strcasecmp strncasecmp)
AC_CHECK_FUNCS(strtoll strtoull)
-AC_CHECK_FUNCS(gethostname setenv putenv select)
-AC_CHECK_FUNCS(fstat getpwuid getuid ftime sysconf fcntl shutdown)
+AC_CHECK_FUNCS(setenv putenv)
+AC_CHECK_FUNCS(fstat getuid ftime sysconf fcntl shutdown)
AC_CHECK_FUNCS(mrand48 drand48)
-AC_CHECK_FUNCS(nanosleep lockf)
+AC_CHECK_FUNCS(lockf)
AC_CHECK_FUNCS(ctime_r asctime_r localtime_r isinf fpclassify fpclass getlogin)
AC_CHECK_FUNCS(madvise posix_madvise posix_fadvise uname)
-AC_CHECK_FUNCS(readdir rewinddir closedir)
asctime_r3=yes
AC_MSG_CHECKING(asctime_r3)
diff -r 3094b7c8d161 -r 19d31622c950 buildtools/Mx/winconfig.h
--- a/buildtools/Mx/winconfig.h Sun Nov 28 22:29:40 2010 +0100
+++ b/buildtools/Mx/winconfig.h Tue Nov 30 10:58:20 2010 +0100
@@ -49,12 +49,6 @@
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
-/* Define to 1 if you have the `memset' function. */
-#define HAVE_MEMSET 1
-
-/* Define to 1 if you have the `mkdir' function. */
-#define HAVE_MKDIR 1
-
/* Define to 1 if the system has the type `ptrdiff_t'. */
#define HAVE_PTRDIFF_T 1
@@ -78,9 +72,6 @@
/* Define to 1 if you have the `strchr' function. */
#define HAVE_STRCHR 1
-/* Define to 1 if you have the `strcspn' function. */
-#define HAVE_STRCSPN 1
-
/* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1
@@ -90,9 +81,6 @@
/* Define to 1 if you have the `strrchr' function. */
#define HAVE_STRRCHR 1
-/* Define to 1 if you have the `strstr' function. */
-#define HAVE_STRSTR 1
-
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
diff -r 3094b7c8d161 -r 19d31622c950 buildtools/burg/winconfig.h
--- a/buildtools/burg/winconfig.h Sun Nov 28 22:29:40 2010 +0100
+++ b/buildtools/burg/winconfig.h Tue Nov 30 10:58:20 2010 +0100
@@ -37,9 +37,6 @@
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
-/* Define to 1 if you have the `memset' function. */
-#define HAVE_MEMSET 1
-
/* Define to 1 if stdbool.h conforms to C99. */
/* #undef HAVE_STDBOOL_H */
diff -r 3094b7c8d161 -r 19d31622c950 buildtools/conf/winconfig.h
--- a/buildtools/conf/winconfig.h Sun Nov 28 22:29:40 2010 +0100
+++ b/buildtools/conf/winconfig.h Tue Nov 30 10:58:20 2010 +0100
@@ -286,9 +286,6 @@
/* Define to 1 if you have the `mrand48' function. */
/* #undef HAVE_MRAND48 */
-/* Define to 1 if you have the `nanosleep' function. */
-/* #undef HAVE_NANOSLEEP */
-
/* Define to 1 if you have the <netdb.h> header file. */
/* #undef HAVE_NETDB_H */
diff -r 3094b7c8d161 -r 19d31622c950 buildtools/mel/winconfig.h
--- a/buildtools/mel/winconfig.h Sun Nov 28 22:29:40 2010 +0100
+++ b/buildtools/mel/winconfig.h Tue Nov 30 10:58:20 2010 +0100
@@ -57,9 +57,6 @@
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
-/* Define to 1 if you have the `memset' function. */
-#define HAVE_MEMSET 1
-
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
diff -r 3094b7c8d161 -r 19d31622c950 clients/configure.ag
--- a/clients/configure.ag Sun Nov 28 22:29:40 2010 +0100
+++ b/clients/configure.ag Tue Nov 30 10:58:20 2010 +0100
@@ -155,7 +155,7 @@
AC_CHECK_HEADERS([strings.h locale.h iconv.h langinfo.h])
# Checks for library functions.
-AC_CHECK_FUNCS([crypt ftime getlogin gethostname localtime_r popen strcasecmp
strncasecmp strtod strtof strtoll strtoull])
+AC_CHECK_FUNCS([crypt ftime getlogin localtime_r popen strcasecmp strncasecmp
strtod strtof strtoll strtoull])
AM_MONETDB_FUNC_GETOPT()
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
