You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2011/07/01 07:20:32 UTC
[lucy-commits] svn commit: r1141805 - in /incubator/lucy/branches/0.1: ./
charmonizer/charmonize.c
Author: marvin
Date: Fri Jul 1 05:20:32 2011
New Revision: 1141805
URL: http://svn.apache.org/viewvc?rev=1141805&view=rev
Log:
LUCY-163 Don't clobber existing #defines.
Modified:
incubator/lucy/branches/0.1/ (props changed)
incubator/lucy/branches/0.1/charmonizer/charmonize.c
Propchange: incubator/lucy/branches/0.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 1 05:20:32 2011
@@ -1 +1 @@
-/incubator/lucy/trunk:1126586,1134011,1134355,1134472,1134843-1134848,1134953,1134956,1139709,1139711,1139714,1140001,1140440
+/incubator/lucy/trunk:1126586,1134011,1134355,1134472,1134843-1134848,1134953,1134956,1139709,1139711,1139714,1140001,1140440,1140964
Modified: incubator/lucy/branches/0.1/charmonizer/charmonize.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.1/charmonizer/charmonize.c?rev=1141805&r1=1141804&r2=1141805&view=diff
==============================================================================
--- incubator/lucy/branches/0.1/charmonizer/charmonize.c (original)
+++ incubator/lucy/branches/0.1/charmonizer/charmonize.c Fri Jul 1 05:20:32 2011
@@ -81,8 +81,12 @@ int main(int argc, char **argv) {
chaz_ConfWriter_append_conf(
"#ifdef CHY_HAS_WINDOWS_H\n"
" /* Target Windows XP. */\n"
- " #define WINVER 0x0500\n"
- " #define _WIN32_WINNT 0x0500\n"
+ " #ifndef WINVER\n"
+ " #define WINVER 0x0500\n"
+ " #endif\n"
+ " #ifndef _WIN32_WINNT\n"
+ " #define _WIN32_WINNT 0x0500\n"
+ " #endif\n"
"#endif\n\n"
);