Changeset: f93f901818b4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f93f901818b4 Modified Files: Branch: default Log Message:
Merge with Oct2010 branch. diffs (26 lines): diff -r a371c979ad5b -r f93f901818b4 clients/src/odbc/driver/ODBCGlobal.h --- a/clients/src/odbc/driver/ODBCGlobal.h Thu Sep 16 08:53:47 2010 +0200 +++ b/clients/src/odbc/driver/ODBCGlobal.h Thu Sep 16 09:24:18 2010 +0200 @@ -122,6 +122,12 @@ #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901 #define PTRFMT "%p" #define PTRFMTCAST /* no cast needed */ +#elif defined(_MSC_VER) +/* On Windows, always use 64 bit integers (even on 32-bit architectures) + * to not get the warning C4311: 'type cast' : pointer truncation from + * 'void *' to 'unsigned int' */ +#define PTRFMT "%I64x" +#define PTRFMTCAST (unsigned __int64) #elif SIZEOF_VOID_P == SIZEOF_INT #define PTRFMT "%x" #define PTRFMTCAST (unsigned int) @@ -131,9 +137,6 @@ #elif SIZEOF_VOID_P == SIZEOF_LONG_LONG #define PTRFMT "%llx" #define PTRFMTCAST (unsigned long long) -#elif SIZEOF_VOID_P == SIZEOF___INT64 -#define PTRFMT "%I64x" -#define PTRFMTCAST (unsigned __int64) #else #error no definition for PTRFMT #endif _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
