Skip to content

Commit

Permalink
Update to latest TEA. Eliminate use of __WIN32__ macro: _WIN32 is mor…
Browse files Browse the repository at this point in the history
…e portable
jan.nijtmans committed Feb 11, 2014
1 parent 33d8265 commit b7baa66
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
@@ -8705,7 +8705,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#ifdef __WIN32__
#ifdef _WIN32
#error cross-compiler
#endif
6 changes: 3 additions & 3 deletions tools/genStubs.tcl
Original file line number Diff line number Diff line change
@@ -268,10 +268,10 @@ proc genStubs::rewriteFile {file text} {
proc genStubs::addPlatformGuard {plat text} {
switch $plat {
win {
return "#ifdef __WIN32__\n${text}#endif /* __WIN32__ */\n"
return "#ifdef _WIN32\n${text}#endif /* _WIN32 */\n"
}
unix {
return "#if !defined(__WIN32__) /* UNIX */\n${text}#endif /* UNIX */\n"
return "#if !defined(_WIN32) /* UNIX */\n${text}#endif /* UNIX */\n"
}
macosx {
return "#ifdef MAC_OSX_TCL\n${text}#endif /* MAC_OSX_TCL */\n"
@@ -280,7 +280,7 @@ proc genStubs::addPlatformGuard {plat text} {
return "#ifdef MAC_OSX_TK\n${text}#endif /* MAC_OSX_TK */\n"
}
x11 {
return "#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */\n${text}#endif /* X11 */\n"
return "#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */\n${text}#endif /* X11 */\n"
}
}
return "$text"
2 changes: 1 addition & 1 deletion win/makefile.vc
Original file line number Diff line number Diff line change
@@ -431,7 +431,7 @@ $<
<<

{$(WINDIR)}.rc{$(TMP_DIR)}.res:
$(rc32) -fo $@ -r -i "$(GENERICDIR)" -D__WIN32__ \
$(rc32) -fo $@ -r -i "$(GENERICDIR)" -D_WIN32 -D__WIN32__ \
-DCOMMAVERSION=$(DOTVERSION:.=,),0 \
-DDOTVERSION=\"$(DOTVERSION)\" \
-DVERSION=\"$(VERSION)$(SUFX)\" \

0 comments on commit b7baa66

Please sign in to comment.