lots of mods getting windows to build under cygwin without visual studio.

[feisty_meow.git] / nucleus / library / configuration / ini_configurator.h

diff --git a/nucleus/library/configuration/ini_configurator.h b/nucleus/library/configuration/ini_configurator.h
index ad99906dd151302c9c90ba64d0a24574dc535623..cb58ccdbfe90b72e2b969e50129086129a5e2921 100644 (file)
--- a/nucleus/library/configuration/ini_configurator.h
+++ b/nucleus/library/configuration/ini_configurator.h
@@ -16,7 +16,7 @@
 \*****************************************************************************/
 
 #include "configurator.h"
-#ifndef __WIN32__
+#if defined(__UNIX__) || defined(__GNU_WINDOWS__)
   #include "ini_parser.h"
   #include <basis/utf_conversion.h>
 #endif
@@ -110,13 +110,13 @@ public:
 
 private:
   filesystem::filename *_ini_name;  //!< the file we're manipulating.
-#ifdef __UNIX__
+#if defined(__UNIX__) || defined(__GNU_WINDOWS__)
   ini_parser *_parser;  //!< used for real storage and parsing.
 #endif
   file_location_default _where;  //!< where to find and store the file.
   bool _add_spaces;  //!< tracks whether we're adding spaces around equals.
 
-#ifdef __WIN32__
+#ifdef _MSC_VER
   bool put_profile_string(const basis::astring &section, const basis::astring &entry,
           const basis::astring &to_store);
     //!< encapsulates windows' ini storage method.
@@ -124,8 +124,7 @@ private:
           const basis::astring &default_value, basis::flexichar *return_buffer,
           int buffer_size);
     //!< encapsulates windows' ini retrieval method.
-#endif
-#ifdef __UNIX__
+#else
   void read_ini_file();
     //!< reads the INI file's contents into memory.
   void write_ini_file();