updating toward goodness

[feisty_meow.git] / nucleus / tools / simple_utilities / create_guid.cpp

diff --git a/nucleus/tools/simple_utilities/create_guid.cpp b/nucleus/tools/simple_utilities/create_guid.cpp
index 104bde7281f0b6d67083ac7c6d9e934cec1520f0..942925de60ba3a56da8e914be232fee34808a7b3 100644 (file)
--- a/nucleus/tools/simple_utilities/create_guid.cpp
+++ b/nucleus/tools/simple_utilities/create_guid.cpp
@@ -27,7 +27,7 @@
 #include <structures/static_memory_gremlin.h>
 #include <textual/string_manipulation.h>
 
-#ifdef __WIN32__
+#ifdef _MSC_VER
   #include <comdef.h>
 #endif
 
@@ -57,9 +57,9 @@ public:
 
 int create_guid::execute()
 {
-//  FUNCDEF("execute");
+  FUNCDEF("execute");
   SETUP_CONSOLE_LOGGER;
-#ifdef __UNIX__
+#if defined(__UNIX__) || defined(__GNU_WINDOWS__)
 
 // this is completely bogus for the time being.  it just produces a random
 // number rather than a guid.
@@ -77,7 +77,7 @@ int create_guid::execute()
   for (int i = 0; i < 8; i++) add_random;
   faux_guid += "}";
   BASE_LOG(faux_guid.lower());
-#elif defined (__WIN32__)
+#elif defined (_MSC_VER)
   GUID guid;
   CoCreateGuid(&guid);
   const int BUFFER_SIZE = 1024;
@@ -103,9 +103,11 @@ HOOPLE_MAIN(create_guid, )
   // static dependencies found by buildor_gen_deps.sh:
   #include <application/application_shell.cpp>
   #include <application/command_line.cpp>
+  #include <application/windoze_helper.cpp>
   #include <basis/astring.cpp>
   #include <basis/common_outcomes.cpp>
   #include <basis/environment.cpp>
+  #include <basis/guards.cpp>
   #include <basis/mutex.cpp>
   #include <basis/utf_conversion.cpp>
   #include <configuration/application_configuration.cpp>