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/06/29 06:42:29 UTC

[lucy-commits] svn commit: r1140964 - /incubator/lucy/trunk/charmonizer/charmonize.c

Author: marvin
Date: Wed Jun 29 04:42:29 2011
New Revision: 1140964

URL: http://svn.apache.org/viewvc?rev=1140964&view=rev
Log:
LUCY-163 Don't clobber existing #defines.

Modified:
    incubator/lucy/trunk/charmonizer/charmonize.c

Modified: incubator/lucy/trunk/charmonizer/charmonize.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/charmonize.c?rev=1140964&r1=1140963&r2=1140964&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/charmonize.c (original)
+++ incubator/lucy/trunk/charmonizer/charmonize.c Wed Jun 29 04:42:29 2011
@@ -77,8 +77,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"
     );