From 3c6cb7f2347aed974543f9082a0ccd297577db41 Mon Sep 17 00:00:00 2001
From: David <david@xagasoft.com>
Date: Mon, 15 Sep 2008 19:26:32 +0000
Subject: david - made precompiler not do wordexp stuff in expand function on
 win32 targets... added buildMinGW.conf file for targeting win32... undef-d
 cpy macro in fstring

---
 src/fstring.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src')

diff --git a/src/fstring.h b/src/fstring.h
index 93216a1..31b55d2 100644
--- a/src/fstring.h
+++ b/src/fstring.h
@@ -11,7 +11,11 @@
 #include <stdint.h>
 #include <string>
 #include <memory>
+
+#ifndef WIN32
 #include <wordexp.h>
+#endif
+
 #include "bu/archival.h"
 #include "bu/archive.h"
 #include "bu/hash.h"
@@ -531,6 +535,7 @@ namespace Bu
 		{
 			flatten();
 
+#ifndef WIN32
 			wordexp_t result;
 
 			/* Expand the string for the program to run.  */
@@ -550,6 +555,7 @@ namespace Bu
 				default:                    /* Some other error.  */
 					return;
 			}
+#endif
 		}
 
 		/**
@@ -1061,4 +1067,8 @@ namespace Bu
 #include <ostream>
 std::basic_ostream<char>& operator<< (std::basic_ostream<char> &os, const Bu::FString &val );
 
+#ifndef VALTEST
+#undef cpy
+#endif
+
 #endif
-- 
cgit v1.2.3