Changeset: fec6ba92f4d8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fec6ba92f4d8 Modified Files: MonetDB5/src/mal/libmonetdb5.rc MonetDB5/src/modules/atoms/blob.mx MonetDB5/src/modules/atoms/color.mx MonetDB5/src/modules/atoms/identifier.mx MonetDB5/src/modules/atoms/inet.mx MonetDB5/src/modules/atoms/mtime.mx MonetDB5/src/modules/atoms/str.mx MonetDB5/src/modules/atoms/streams.mx MonetDB5/src/modules/atoms/url.mx MonetDB5/src/modules/kernel/aggr.mx MonetDB5/src/modules/kernel/alarm.mx MonetDB5/src/modules/kernel/algebra.mx MonetDB5/src/modules/kernel/array.mx MonetDB5/src/modules/kernel/bat5.mx MonetDB5/src/modules/kernel/batcalc.mx MonetDB5/src/modules/kernel/batcast.mx MonetDB5/src/modules/kernel/batcolor.mx MonetDB5/src/modules/kernel/batifthen.mx MonetDB5/src/modules/kernel/batmmath.mx MonetDB5/src/modules/kernel/batmtime.mx MonetDB5/src/modules/kernel/batstr.mx MonetDB5/src/modules/kernel/calc.mx MonetDB5/src/modules/kernel/counters.mx MonetDB5/src/modules/kernel/group.mx MonetDB5/src/modules/kernel/lock.mx MonetDB5/src/modules/kernel/logger.mx MonetDB5/src/modules/kernel/microbenchmark.mx MonetDB5/src/modules/kernel/mmath.mx MonetDB5/src/modules/kernel/sema.mx MonetDB5/src/modules/kernel/status.mx MonetDB5/src/modules/kernel/unix.mx MonetDB5/src/modules/mal/algebraExtensions.mx MonetDB5/src/modules/mal/attach.mx MonetDB5/src/modules/mal/batExtensions.mx MonetDB5/src/modules/mal/bbp.mx MonetDB5/src/modules/mal/box.mx MonetDB5/src/modules/mal/bpm.mx MonetDB5/src/modules/mal/chopper.mx MonetDB5/src/modules/mal/clients.mx MonetDB5/src/modules/mal/cluster.mx MonetDB5/src/modules/mal/const.mx MonetDB5/src/modules/mal/constraints.mx MonetDB5/src/modules/mal/factories.mx MonetDB5/src/modules/mal/groupby.mx MonetDB5/src/modules/mal/histogram.mx MonetDB5/src/modules/mal/inspect.mx MonetDB5/src/modules/mal/language.mx MonetDB5/src/modules/mal/mal_io.mx MonetDB5/src/modules/mal/mal_mapi.mx MonetDB5/src/modules/mal/manual.mx MonetDB5/src/modules/mal/mat.mx MonetDB5/src/modules/mal/mdb.mx MonetDB5/src/modules/mal/mkey.mx MonetDB5/src/modules/mal/pcre.mx MonetDB5/src/modules/mal/pma.mx MonetDB5/src/modules/mal/pqueue.mx MonetDB5/src/modules/mal/profiler.mx MonetDB5/src/modules/mal/radix.mx MonetDB5/src/modules/mal/recycle.mx MonetDB5/src/modules/mal/remote.mx MonetDB5/src/modules/mal/replication.mx MonetDB5/src/modules/mal/sabaoth.mx MonetDB5/src/modules/mal/statistics.mx MonetDB5/src/modules/mal/tablet.mx MonetDB5/src/modules/mal/tokenizer.mx MonetDB5/src/modules/mal/trader.mx MonetDB5/src/modules/mal/transaction.mx MonetDB5/src/modules/mal/txtsim.mx MonetDB5/src/modules/mal/urlbox.mx MonetDB5/src/modules/mal/zorder.mx MonetDB5/src/tools/libmonetdb5.rc MonetDB5/vertoo.config Branch: default Log Message:
Steps towards being able to compile MonetDB5 again on Windows. We're not there yet. diffs (truncated from 932 to 300 lines): diff -r 6d394e12b004 -r fec6ba92f4d8 MonetDB5/src/mal/libmonetdb5.rc --- a/MonetDB5/src/mal/libmonetdb5.rc Tue Nov 02 16:01:38 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -#include <Windows.h> - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -1 VERSIONINFO - FILEVERSION 5,23,0,1 - PRODUCTVERSION 5,23,0,1 - FILEFLAGSMASK 0x3fL - FILEFLAGS 0 - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE 0 -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" // US-English; Unicode - BEGIN - VALUE "Comments", "\0" - VALUE "CompanyName", "CWI\0" - VALUE "FileDescription", "MonetDB5 Library DLL\0" - VALUE "FileVersion", "5.23.0\0" - // ^^^^^^^^ - // Maintained via vertoo. Please don't modify by hand! - // Contact [email protected] for details and/or assistance. - VALUE "InternalName", "libmonetdb5\0" - VALUE "LegalCopyright", "Copyright © CWI 2004-2010\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "libmonetdb5.dll\0" - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "MonetDB5 Server\0" - VALUE "ProductVersion", "5.23.0\0" - // ^^^^^^^^ - // Maintained via vertoo. Please don't modify by hand! - // Contact [email protected] for details and/or assistance. - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 // US-English; Unicode - END -END diff -r 6d394e12b004 -r fec6ba92f4d8 MonetDB5/src/modules/atoms/blob.mx --- a/MonetDB5/src/modules/atoms/blob.mx Tue Nov 02 16:01:38 2010 +0100 +++ b/MonetDB5/src/modules/atoms/blob.mx Tue Nov 02 16:17:27 2010 +0100 @@ -134,7 +134,7 @@ #define sqlblob blob #ifdef WIN32 -#ifndef LIBBLOB +#ifndef LIBATOMS #define blob_export extern __declspec(dllimport) #else #define blob_export extern __declspec(dllexport) diff -r 6d394e12b004 -r fec6ba92f4d8 MonetDB5/src/modules/atoms/color.mx --- a/MonetDB5/src/modules/atoms/color.mx Tue Nov 02 16:01:38 2010 +0100 +++ b/MonetDB5/src/modules/atoms/color.mx Tue Nov 02 16:17:27 2010 +0100 @@ -130,7 +130,7 @@ typedef unsigned int color; #ifdef WIN32 -#ifndef LIBCOLOR +#ifndef LIBATOMS #define color_export extern __declspec(dllimport) #else #define color_export extern __declspec(dllexport) diff -r 6d394e12b004 -r fec6ba92f4d8 MonetDB5/src/modules/atoms/identifier.mx --- a/MonetDB5/src/modules/atoms/identifier.mx Tue Nov 02 16:01:38 2010 +0100 +++ b/MonetDB5/src/modules/atoms/identifier.mx Tue Nov 02 16:17:27 2010 +0100 @@ -58,7 +58,7 @@ typedef str identifier; #ifdef WIN32 -#ifndef LIBIDENTIFIER +#ifndef LIBATOMS #define identifier_export extern __declspec(dllimport) #else #define identifier_export extern __declspec(dllexport) diff -r 6d394e12b004 -r fec6ba92f4d8 MonetDB5/src/modules/atoms/inet.mx --- a/MonetDB5/src/modules/atoms/inet.mx Tue Nov 02 16:01:38 2010 +0100 +++ b/MonetDB5/src/modules/atoms/inet.mx Tue Nov 02 16:17:27 2010 +0100 @@ -55,7 +55,7 @@ #define in_setnil(i) (i)->q1 = (i)->q2 = (i)->q3 = (i)->q4 = (i)->mask = (i)->filler1 = (i)->filler2 = 0; (i)->isnil = 1 #ifdef WIN32 -#ifndef LIBINET +#ifndef LIBATOMS #define inet_export extern __declspec(dllimport) #else #define inet_export extern __declspec(dllexport) diff -r 6d394e12b004 -r fec6ba92f4d8 MonetDB5/src/modules/atoms/mtime.mx --- a/MonetDB5/src/modules/atoms/mtime.mx Tue Nov 02 16:01:38 2010 +0100 +++ b/MonetDB5/src/modules/atoms/mtime.mx Tue Nov 02 16:17:27 2010 +0100 @@ -843,7 +843,7 @@ #include "mal_exception.h" #ifdef WIN32 -#ifndef LIBMTIME +#ifndef LIBATOMS #define mtime_export extern __declspec(dllimport) #else #define mtime_export extern __declspec(dllexport) diff -r 6d394e12b004 -r fec6ba92f4d8 MonetDB5/src/modules/atoms/str.mx --- a/MonetDB5/src/modules/atoms/str.mx Tue Nov 02 16:01:38 2010 +0100 +++ b/MonetDB5/src/modules/atoms/str.mx Tue Nov 02 16:17:27 2010 +0100 @@ -251,7 +251,7 @@ #include "ctype.h" #ifdef WIN32 -#ifndef LIBSTR +#ifndef LIBATOMS #define str_export extern __declspec(dllimport) #else #define str_export extern __declspec(dllexport) diff -r 6d394e12b004 -r fec6ba92f4d8 MonetDB5/src/modules/atoms/streams.mx --- a/MonetDB5/src/modules/atoms/streams.mx Tue Nov 02 16:01:38 2010 +0100 +++ b/MonetDB5/src/modules/atoms/streams.mx Tue Nov 02 16:17:27 2010 +0100 @@ -126,7 +126,7 @@ #include <stream_socket.h> #ifdef WIN32 -#ifndef LIBSTREAMS +#ifndef LIBATOMS #define streams_export extern __declspec(dllimport) #else #define streams_export extern __declspec(dllexport) diff -r 6d394e12b004 -r fec6ba92f4d8 MonetDB5/src/modules/atoms/url.mx --- a/MonetDB5/src/modules/atoms/url.mx Tue Nov 02 16:01:38 2010 +0100 +++ b/MonetDB5/src/modules/atoms/url.mx Tue Nov 02 16:17:27 2010 +0100 @@ -179,7 +179,7 @@ typedef str url; #ifdef WIN32 -#ifndef LIBURL +#ifndef LIBATOMS #define url_export extern __declspec(dllimport) #else #define url_export extern __declspec(dllexport) diff -r 6d394e12b004 -r fec6ba92f4d8 MonetDB5/src/modules/kernel/aggr.mx --- a/MonetDB5/src/modules/kernel/aggr.mx Tue Nov 02 16:01:38 2010 +0100 +++ b/MonetDB5/src/modules/kernel/aggr.mx Tue Nov 02 16:17:27 2010 +0100 @@ -271,7 +271,7 @@ #include "aggr_bge_count.h" #ifdef WIN32 -#ifndef LIBAGGR +#ifndef LIBKERNEL #define aggr_export extern __declspec(dllimport) #else #define aggr_export extern __declspec(dllexport) diff -r 6d394e12b004 -r fec6ba92f4d8 MonetDB5/src/modules/kernel/alarm.mx --- a/MonetDB5/src/modules/kernel/alarm.mx Tue Nov 02 16:01:38 2010 +0100 +++ b/MonetDB5/src/modules/kernel/alarm.mx Tue Nov 02 16:17:27 2010 +0100 @@ -88,7 +88,7 @@ #include <time.h> #ifdef WIN32 -#ifndef LIBALARM +#ifndef LIBKERNEL #define alarm_export extern __declspec(dllimport) #else #define alarm_export extern __declspec(dllexport) diff -r 6d394e12b004 -r fec6ba92f4d8 MonetDB5/src/modules/kernel/algebra.mx --- a/MonetDB5/src/modules/kernel/algebra.mx Tue Nov 02 16:01:38 2010 +0100 +++ b/MonetDB5/src/modules/kernel/algebra.mx Tue Nov 02 16:17:27 2010 +0100 @@ -893,7 +893,7 @@ #include "mal_exception.h" #ifdef WIN32 -#ifndef LIBALGEBRA +#ifndef LIBKERNEL #define algebra_export extern __declspec(dllimport) #else #define algebra_export extern __declspec(dllexport) diff -r 6d394e12b004 -r fec6ba92f4d8 MonetDB5/src/modules/kernel/array.mx --- a/MonetDB5/src/modules/kernel/array.mx Tue Nov 02 16:01:38 2010 +0100 +++ b/MonetDB5/src/modules/kernel/array.mx Tue Nov 02 16:17:27 2010 +0100 @@ -103,7 +103,7 @@ /*----------------------------------------------------------------------------*/ #ifdef WIN32 -#ifndef LIBARRAY +#ifndef LIBKERNEL #define array_export extern __declspec(dllimport) #else #define array_export extern __declspec(dllexport) diff -r 6d394e12b004 -r fec6ba92f4d8 MonetDB5/src/modules/kernel/bat5.mx --- a/MonetDB5/src/modules/kernel/bat5.mx Tue Nov 02 16:01:38 2010 +0100 +++ b/MonetDB5/src/modules/kernel/bat5.mx Tue Nov 02 16:17:27 2010 +0100 @@ -606,7 +606,7 @@ #include <gdk.h> #ifdef WIN32 -#ifndef LIBBAT5 +#ifndef LIBKERNEL #define bat5_export extern __declspec(dllimport) #else #define bat5_export extern __declspec(dllexport) diff -r 6d394e12b004 -r fec6ba92f4d8 MonetDB5/src/modules/kernel/batcalc.mx --- a/MonetDB5/src/modules/kernel/batcalc.mx Tue Nov 02 16:01:38 2010 +0100 +++ b/MonetDB5/src/modules/kernel/batcalc.mx Tue Nov 02 16:17:27 2010 +0100 @@ -326,7 +326,7 @@ #include "mal_exception.h" #ifdef WIN32 -#ifndef LIBBATCALC +#ifndef LIBKERNEL #define batcalc_export extern __declspec(dllimport) #else #define batcalc_export extern __declspec(dllexport) diff -r 6d394e12b004 -r fec6ba92f4d8 MonetDB5/src/modules/kernel/batcast.mx --- a/MonetDB5/src/modules/kernel/batcast.mx Tue Nov 02 16:01:38 2010 +0100 +++ b/MonetDB5/src/modules/kernel/batcast.mx Tue Nov 02 16:17:27 2010 +0100 @@ -133,7 +133,7 @@ #include "mal_exception.h" #ifdef WIN32 -#ifndef LIBBATCAST +#ifndef LIBKERNEL #define batcast_export extern __declspec(dllimport) #else #define batcast_export extern __declspec(dllexport) diff -r 6d394e12b004 -r fec6ba92f4d8 MonetDB5/src/modules/kernel/batcolor.mx --- a/MonetDB5/src/modules/kernel/batcolor.mx Tue Nov 02 16:01:38 2010 +0100 +++ b/MonetDB5/src/modules/kernel/batcolor.mx Tue Nov 02 16:17:27 2010 +0100 @@ -111,7 +111,7 @@ #include "mal_exception.h" #ifdef WIN32 -#ifndef LIBBATCOLOR +#ifndef LIBKERNEL #define batcolor_export extern __declspec(dllimport) #else #define batcolor_export extern __declspec(dllexport) diff -r 6d394e12b004 -r fec6ba92f4d8 MonetDB5/src/modules/kernel/batifthen.mx --- a/MonetDB5/src/modules/kernel/batifthen.mx Tue Nov 02 16:01:38 2010 +0100 +++ b/MonetDB5/src/modules/kernel/batifthen.mx Tue Nov 02 16:17:27 2010 +0100 @@ -72,7 +72,7 @@ #include "mal_exception.h" #ifdef WIN32 -#ifndef LIBBATIFTHEN +#ifndef LIBKERNEL #define batifthen_export extern __declspec(dllimport) #else #define batifthen_export extern __declspec(dllexport) diff -r 6d394e12b004 -r fec6ba92f4d8 MonetDB5/src/modules/kernel/batmmath.mx --- a/MonetDB5/src/modules/kernel/batmmath.mx Tue Nov 02 16:01:38 2010 +0100 +++ b/MonetDB5/src/modules/kernel/batmmath.mx Tue Nov 02 16:17:27 2010 +0100 @@ -84,7 +84,7 @@ #include "batmmath.h" #ifdef WIN32 -#ifndef LIBBATMMATH +#ifndef LIBKERNEL #define batmmath_export extern __declspec(dllimport) #else #define batmmath_export extern __declspec(dllexport) diff -r 6d394e12b004 -r fec6ba92f4d8 MonetDB5/src/modules/kernel/batmtime.mx --- a/MonetDB5/src/modules/kernel/batmtime.mx Tue Nov 02 16:01:38 2010 +0100 +++ b/MonetDB5/src/modules/kernel/batmtime.mx Tue Nov 02 16:17:27 2010 +0100 @@ -83,7 +83,7 @@ #include "mtime.h" #ifdef WIN32 -#ifndef LIBBATMTIME +#ifndef LIBKERNEL #define batmtime_export extern __declspec(dllimport) #else #define batmtime_export extern __declspec(dllexport) diff -r 6d394e12b004 -r fec6ba92f4d8 MonetDB5/src/modules/kernel/batstr.mx --- a/MonetDB5/src/modules/kernel/batstr.mx Tue Nov 02 16:01:38 2010 +0100 +++ b/MonetDB5/src/modules/kernel/batstr.mx Tue Nov 02 16:17:27 2010 +0100 @@ -184,7 +184,7 @@ #endif #ifdef WIN32 -#ifndef LIBBATSTR +#ifndef LIBKERNEL #define batstr_export extern __declspec(dllimport) #else #define batstr_export extern __declspec(dllexport) diff -r 6d394e12b004 -r fec6ba92f4d8 MonetDB5/src/modules/kernel/calc.mx --- a/MonetDB5/src/modules/kernel/calc.mx Tue Nov 02 16:01:38 2010 +0100 +++ b/MonetDB5/src/modules/kernel/calc.mx Tue Nov 02 16:17:27 2010 +0100 @@ -571,7 +571,7 @@ #include "mal_interpreter.h" #ifdef WIN32 -#ifndef LIBCALC +#ifndef LIBKERNEL #define calc_export extern __declspec(dllimport) #else #define calc_export extern __declspec(dllexport) diff -r 6d394e12b004 -r fec6ba92f4d8 MonetDB5/src/modules/kernel/counters.mx --- a/MonetDB5/src/modules/kernel/counters.mx Tue Nov 02 16:01:38 2010 +0100 _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
