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

1 files changed, 10 insertions, 0 deletions

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