Changeset: 78c72d325ebe for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=78c72d325ebe Modified Files: NT/rules.msc Branch: Jun2016 Log Message:
Merge with Jul2015 branch. diffs (15 lines): diff --git a/NT/rules.msc b/NT/rules.msc --- a/NT/rules.msc +++ b/NT/rules.msc @@ -282,6 +282,11 @@ create_winconfig_conds_new_py: !ELSE $(ECHO) BITS64_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" !ENDIF +!IFDEF BITS64OID32 + $(ECHO) BITS64OID32_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" +!ELSE + $(ECHO) BITS64OID32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" +!ENDIF !IFDEF CROSS_COMPILING $(ECHO) CROSS_COMPILING_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" !ELSE _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list