Merge branch 'release-2.140.136'

[feisty_meow.git] / nucleus / library / versions / version_checker.cpp

diff --git a/nucleus/library/versions/version_checker.cpp b/nucleus/library/versions/version_checker.cpp
index 70a8e2c47b8719cabd55ae8adb12d6b92cc0e47a..9effe71787c05b9332b59b74fd4a415ca38df0a8 100644 (file)
--- a/nucleus/library/versions/version_checker.cpp
+++ b/nucleus/library/versions/version_checker.cpp
@@ -40,13 +40,12 @@ using namespace structures;
   #define __build_FILE_VERSION "108.420.1024.10008"
 #endif
 
-#ifdef _MSC_VER
-  #include <direct.h>
+#ifdef __WIN32__
+//  #include <direct.h>
   #include <winver.h>
 #endif
 
-#if defined(_MSC_VER)
-//#ifdef __WIN32__
+#ifdef __WIN32__
   // ensures that we handle the data properly regardless of unicode settings.
   #ifdef UNICODE
     #define render_ptr(ptr) from_unicode_temp( (UTF16 *) ptr)
@@ -100,7 +99,7 @@ bool version_checker::good_version() const
 bool version_checker::loaded(const astring &library_file_name)
 {
 //#ifdef __WIN32__
-#if defined(_MSC_VER)
+#if defined(__WIN32__)
   return bool(get_handle(library_file_name) != 0); 
 #else
 //temp code. 
@@ -111,7 +110,7 @@ bool version_checker::loaded(const astring &library_file_name)
 void *version_checker::get_handle(const astring &library_file_name)
 {
 //#ifdef __WIN32__
-#if defined(_MSC_VER)
+#if defined(__WIN32__)
   return GetModuleHandle(to_unicode_temp(library_file_name));
 #else
   if (library_file_name.t()) return NULL_POINTER; else return NULL_POINTER;
@@ -120,10 +119,11 @@ void *version_checker::get_handle(const astring &library_file_name)
 
 astring version_checker::module_name(const void *module_handle)
 {
-#if defined(__UNIX__) || defined(__GNU_WINDOWS__)
+#if defined(__UNIX__) 
+//|| defined(__GNU_WINDOWS__)
   if (module_handle) {}
   return application_configuration::application_name();
-#elif defined(_MSC_VER)
+#elif defined(__WIN32__)
 //#elif defined(__WIN32__)
   flexichar low_buff[MAX_ABS_PATH + 1];
   GetModuleFileName((HMODULE)module_handle, low_buff, MAX_ABS_PATH - 1);
@@ -146,9 +146,9 @@ bool version_checker::retrieve_version_info(const astring &filename,
 
   // determine the required size of the version info buffer.
   int required_size;
-#if defined(_MSC_VER)
+#if defined(__WIN32__)
 //#ifdef __WIN32__
-  un_long module_handle;  // filled with the dll or exe handle.
+  DWORD module_handle;  // filled with the dll or exe handle.
   required_size = GetFileVersionInfoSize(to_unicode_temp(filename), &module_handle);
 #else
   required_size = 0 && filename.t();
@@ -158,7 +158,7 @@ bool version_checker::retrieve_version_info(const astring &filename,
   
   // read the version info into our buffer.
   bool success = false;
-#if defined(_MSC_VER)
+#if defined(__WIN32__)
 //#ifdef __WIN32__
   success = GetFileVersionInfo(to_unicode_temp(filename), module_handle,
       required_size, to_fill.access());
@@ -173,7 +173,7 @@ bool version_checker::get_language(byte_array &version_chunk,
 {
   high = 0;
   low = 0;
-#if defined(_MSC_VER)
+#if defined(__WIN32__)
 //#ifdef __WIN32__
   // determine the language that the version's written in.
   basis::un_int data_size;
@@ -197,7 +197,8 @@ bool version_checker::get_language(byte_array &version_chunk,
 version version_checker::retrieve_version(const astring &filename)
 {
 //#ifdef UNIX
-#if defined(__UNIX__) || defined(__GNU_WINDOWS__)
+#if defined(__UNIX__)
+// || defined(__GNU_WINDOWS__)
 
   // totally bogus stand-in; this just returns the version we were built with
   // rather than the version that's actually tagged on the file.
@@ -222,7 +223,7 @@ version version_checker::retrieve_version(const astring &filename)
   astring file_version_key(root_key + astring("\\FileVersion"));
 
   astring version_string;
-#ifdef _MSC_VER
+#ifdef __WIN32__
   abyte *file_version_pointer;
   basis::un_int data_size;
   if (!VerQueryValue(version_info_found.access(),
@@ -266,7 +267,7 @@ bool version_checker::get_record(const astring &filename,
   // the various version pieces are retrieved...
 
 //#ifdef __WIN32__
-#ifdef _MSC_VER
+#ifdef __WIN32__
   basis::un_int data_size;
   void *data_pointer;
 
@@ -359,9 +360,10 @@ void version_checker::complain_wrong_version(const astring &library_file_name,
   to_show += astring("].  ");
   to_show += *_version_complaint;
 //#ifdef __UNIX__
-#if defined(__UNIX__) || defined(__GNU_WINDOWS__)
+#if defined(__UNIX__) 
+//|| defined(__GNU_WINDOWS__)
   continuable_error("version checking", "failure", to_show.s());
-#elif defined(_MSC_VER)
+#elif defined(__WIN32__)
   MessageBox(0, to_unicode_temp(to_show),
       to_unicode_temp("version_checking::failure"), MB_OK);
 #endif