cleanup
diff --git a/include/win32config.h b/include/win32config.h
index fcd2862..8dcfcde 100644
--- a/include/win32config.h
+++ b/include/win32config.h
@@ -80,23 +80,11 @@
}
#endif /* _MSC_VER */
-#ifdef _MSC_VER
-/* We don't use trio when compiling under MSVC. This is not because trio
- is bad, but because MSVC has no easy way to conditionally include a .c
- file in the project. In order to enable trio usage, we would have to compile
- all trio functionality into the executable, even if we don't use it.
- Since MS C-runtime has all required functions, trio is not necessary. */
-#ifdef WITH_TRIO
-#undef WITH_TRIO
-#endif /* WITH_TRIO */
-#ifndef WITHOUT_TRIO
-#define WITHOUT_TRIO
-#endif /* WITHOUT_TRIO */
-/* Microsoft's C runtime names all non-ANSI functions with a leading
- underscore. Since functionality is still the same, they can be used. */
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#define mkdir(p,m) _mkdir(p)
#define snprintf _snprintf
-#define vsnprintf _vsnprintf
-#endif /* _MSC_VER */
+#define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
+#endif
/* Threading API to use should be specified here for compatibility reasons.
This is however best specified on the compiler's command-line. */
diff --git a/win32/Readme.txt b/win32/Readme.txt
index b7d85d2..bd3f173 100644
--- a/win32/Readme.txt
+++ b/win32/Readme.txt
@@ -95,11 +95,15 @@
-------------
After the configuration stage has been completed, you want to build
-the software. To do that, type
+the software. You will have to use the make tool which comes with
+your compiler. If you, for example, configured the source to build
+with Microsoft's MSVC compiler, you would use the NMAKE utility. If
+ýou configured it to build with GNU C compiler, mingw edition, you
+would use the GNU make. Assuming you use MSVC, type
nmake
-in the win32 subdirectory.When the building completes, you will find
+in the win32 subdirectory. When the building completes, you will find
the executable files in win32\binaries directory.
You can install the software into the directory you specified to the
@@ -125,5 +129,5 @@
which I have never seen.
-March 2002, Igor Zlatkovic <igor@stud.fh-frankfurt.de>
+November 2002, Igor Zlatkovic <igor@stud.fh-frankfurt.de>