Changeset: 0ee44ecd7e8a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0ee44ecd7e8a Modified Files: NT/monetdb_config.h.in buildtools/ChangeLog.Aug2011 Branch: Aug2011 Log Message:
The default OID size for 64-bit Windows is now 64 bits. diffs (33 lines): 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 @@ -691,17 +691,7 @@ #define MONETDB_RELEASE "unreleased" /* Define if the oid type should use 32 bits on a 64-bit architecture */ -/* 32-bit OIDs are used by default on 64-bit Windows; - * compile with `nmake MONET_OID64=1` to use 64-bit OIDs on 64-bit Windows; - * remove the following 5 lines (and this comment) to make 64-bit OIDs - * default on 64-bit Windows (then to be overruled via `nmake MONET_OID32=1`; - * see also rules.msc . - */ -#ifdef _WIN64 -#ifndef MONET_OID64 -#define MONET_OID32 1 -#endif -#endif +/* #undef MONET_OID32 */ /* Suffix for C++ files */ #define MX_CXX_SUFFIX "cxx" diff --git a/buildtools/ChangeLog.Aug2011 b/buildtools/ChangeLog.Aug2011 --- a/buildtools/ChangeLog.Aug2011 +++ b/buildtools/ChangeLog.Aug2011 @@ -1,3 +1,7 @@ # ChangeLog file for buildtools # This file is updated with Maddlog +* Wed Jul 20 2011 Sjoerd Mullender <[email protected]> +- The default OID size for 64-bit Windows is now 64 bits. Databases with + 32 bit OIDs are converted automatically. + _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
