Changeset: 4764dddd4ea3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4764dddd4ea3
Modified Files:
NT/monetdb_config.h.in
common/options/monet_options.c
configure.ag
gdk/gdk.h
gdk/gdk_utils.c
monetdb5/mal/mal_interpreter.c
monetdb5/modules/atoms/xml.c
monetdb5/modules/atoms/xml.h
monetdb5/modules/mal/xmlcolumn.c
Branch: headless
Log Message:
Merge with default branch.
diffs (truncated from 411 to 300 lines):
diff --git a/NT/Makefile b/NT/Makefile
--- a/NT/Makefile
+++ b/NT/Makefile
@@ -33,6 +33,7 @@
$(INSTALL) ..\NT\installer$(bits)\*.sln "$(prefix)"
$(INSTALL) ..\NT\installer$(bits)\*.vdproj "$(prefix)"
-if exist "C:\Program Files (x86)" if $(bits)==32 cd
"$(prefix)"&&C:\cygwin\bin\sed.exe -i "s/Program Files/Program Files (x86)/"
*.vdproj
+ if not exist "C:\Program Files (x86)\Microsoft Visual Studio 10.0" if
not exist "C:\Program Files\Microsoft Visual Studio 10.0" cd
"$(prefix)"&&C:\cygwin\bin\sed.exe -i "s/Format Version 11.00/Format Version
10.00/;s/Visual Studio 2010/Visual Studio 2008/;s/-vs10//;s/_VC100_/_VC90_/"
*.vdproj *.sln
$(srcdir)\Makefile.msc: "$(srcdir)\Makefile.ag"
cd "$(srcdir)"&&set PYTHONPATH=buildtools\autogen&&python
buildtools\autogen\autogen.py
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -211,8 +211,8 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4FC22BC37061413FA8B8F80F91330E61"
{
- "SourcePath" = "8:lib\\monetdb5\\autoload\\50_geom.mal"
- "TargetName" = "8:50_geom.mal"
+ "SourcePath" = "8:lib\\monetdb5\\autoload\\30_geom.mal"
+ "TargetName" = "8:30_geom.mal"
"Tag" = "8:"
"Folder" = "8:_8FBEE32B5DFA4DCEA7CA122FC483D244"
"Condition" = "8:"
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -211,8 +211,8 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4FC22BC37061413FA8B8F80F91330E61"
{
- "SourcePath" = "8:lib\\monetdb5\\autoload\\50_geom.mal"
- "TargetName" = "8:50_geom.mal"
+ "SourcePath" = "8:lib\\monetdb5\\autoload\\30_geom.mal"
+ "TargetName" = "8:30_geom.mal"
"Tag" = "8:"
"Folder" = "8:_8FBEE32B5DFA4DCEA7CA122FC483D244"
"Condition" = "8:"
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
@@ -454,6 +454,8 @@
/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
+#define strdup(s) _strdup(s)
+
#ifndef strcasecmp
#define strcasecmp(x,y) _stricmp(x,y)
#endif
@@ -645,7 +647,13 @@
#include <sys/stat.h>
#define lstat _stat64
+#ifdef stat
+#undef stat
+#endif
#define stat _stat64
+#ifdef fstat
+#undef fstat
+#endif
#define fstat _fstat64
#ifndef S_ISREG /* swig-generated source file doesn't include us first
*/
#define S_ISREG(mode) (((mode) & _S_IFMT) == _S_IFREG)
diff --git a/buildtools/Mx/Mx.h b/buildtools/Mx/Mx.h
--- a/buildtools/Mx/Mx.h
+++ b/buildtools/Mx/Mx.h
@@ -38,12 +38,6 @@
#ifdef HAVE_STRING_H
#include <string.h>
-
-#ifdef NATIVE_WIN32
-/* The POSIX name for this item is deprecated. Instead, use the ISO
- C++ conformant name: _strdup. See online help for details. */
-#define strdup _strdup
-#endif
#endif
#define DB_DEF 0x10
diff --git a/buildtools/Mx/getopt.c b/buildtools/Mx/getopt.c
--- a/buildtools/Mx/getopt.c
+++ b/buildtools/Mx/getopt.c
@@ -36,7 +36,7 @@
char *optarg;
int
-getopt(int argc, char **argv, char *opts)
+getopt(int argc, char **argv, const char *opts)
{
static int sp = 1;
register int c;
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -685,7 +685,7 @@
msc['BINS'].append((bin, '$(C_inst_%s_exe)' % bin2, condname))
condname = '!defined(' + ') &&
!defined('.join(binsmap['CONDINST']) + ')'
msc['NBINS'].append((bin, '$(C_noinst_%s_exe)' % bin2, condname))
- if binsmap.has_key('NOINST'):
+ elif binsmap.has_key('NOINST'):
msc['NBINS'].append((bin, bin, ''))
else:
msc['BINS'].append((bin, bin, ''))
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -27,12 +27,6 @@
#include <ctype.h>
#include "msqldump.h"
-#ifdef NATIVE_WIN32
-/* The POSIX name for this item is deprecated. Instead, use the ISO
- C++ conformant name: _strdup. See online help for details. */
-#define strdup _strdup
-#endif
-
static void
quoted_print(stream *f, const char *s, const char singleq)
{
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -81,10 +81,6 @@
#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
#endif
-#ifdef NATIVE_WIN32
-#define strdup _strdup
-#endif
-
enum modes {
MAL,
SQL
diff --git a/clients/mapiclient/msqldump.c b/clients/mapiclient/msqldump.c
--- a/clients/mapiclient/msqldump.c
+++ b/clients/mapiclient/msqldump.c
@@ -50,10 +50,6 @@
#include "msqldump.h"
#include "mprompt.h"
-#ifdef NATIVE_WIN32
-#define strdup _strdup
-#endif
-
static void
usage(const char *prog, int xit)
{
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -822,10 +822,6 @@
# endif
#endif
-#ifdef NATIVE_WIN32
-#define strdup _strdup
-#endif
-
#ifdef HAVE_CRYPT_H
# include <crypt.h>
#else
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
@@ -93,10 +93,6 @@
#include <stdio.h>
#include <ctype.h>
-#ifdef NATIVE_WIN32
-# define strdup _strdup
-#endif
-
#ifdef SQLLEN /* it's a define for 32, a typedef for 64 */
#define LENFMT "%d"
#define ULENFMT "%u"
diff --git a/clients/odbc/winsetup/setup.c b/clients/odbc/winsetup/setup.c
--- a/clients/odbc/winsetup/setup.c
+++ b/clients/odbc/winsetup/setup.c
@@ -38,10 +38,6 @@
#include <odbcinst.h>
#include "resource.h"
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-#define strdup _strdup
-#endif
-
static char *DriverName = "MonetDB ODBC Driver";
static HINSTANCE instance;
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
@@ -52,7 +52,6 @@
#endif
#ifdef NATIVE_WIN32
-#define strdup _strdup
#define getpid _getpid
#endif
@@ -233,7 +232,7 @@
if (Set == NULL)
return 0;
-#define N_OPTIONS 14 /*MUST MATCH # OPTIONS BELOW */
+#define N_OPTIONS 12 /*MUST MATCH # OPTIONS BELOW */
set = malloc(sizeof(opt) * N_OPTIONS);
if (set == NULL)
return 0;
@@ -281,14 +280,6 @@
set[i].value = strdup("false");
i++;
set[i].kind = opt_builtin;
- set[i].name = strdup("default_pipe");
- set[i].value =
strdup("inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector");
- i++;
- set[i].kind = opt_builtin;
- set[i].name = strdup("minimal_pipe");
- set[i].value =
strdup("inline,remap,deadcode,multiplex,garbageCollector");
- i++;
- set[i].kind = opt_builtin;
set[i].name = strdup("sql_optimizer");
set[i].value = strdup("default_pipe");
i++;
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -148,10 +148,6 @@
int (*fsetpos) (stream *s, lng p);
};
-#ifdef NATIVE_WIN32
-#define strdup _strdup
-#endif
-
int
mnstr_init(void)
{
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2725,7 +2725,6 @@
getlogin \
getopt \
getopt_long \
- getrlimit \
GetSystemInfo \
gettimeofday \
getuid \
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2424,7 +2424,6 @@
#endif
#define fdopen _fdopen
#define putenv _putenv
-#define strdup _strdup
#endif
/*
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -56,17 +56,6 @@
# include <sys/sysctl.h>
#endif
-/* getrlimit on FreeBSD */
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_RESOURCE_H
-# include <sys/resource.h>
-#endif
-
#ifdef NATIVE_WIN32
#define chdir _chdir
#endif
@@ -430,15 +419,16 @@
}
#elif defined(HAVE_SYS_SYSCTL_H) && defined(HW_PAGESIZE)
{
- size_t len = sizeof(_MT_pagesize);
- int mib[3];
+ int size;
+ size_t len = sizeof(int);
+ int mib[2];
/* Everyone should have permission to make this call,
* if we get a failure something is really wrong. */
mib[0] = CTL_HW;
mib[1] = HW_PAGESIZE;
- mib[2] = -1;
- sysctl(mib, 3, &_MT_pagesize, &len, NULL, 0);
+ sysctl(mib, 2, &size, &len, NULL, 0);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
