WinDefs: Do not redefine uintptr_t

[lugaru.git] / Source / WinDefs.h

diff --git a/Source/WinDefs.h b/Source/WinDefs.h
index 31dd352d12598aa1fc7239c0668fb692001ec6bb..47fb4d3d47b273c15201a45875f8f0d8b62686bf 100644 (file)
--- a/Source/WinDefs.h
+++ b/Source/WinDefs.h
@@ -89,8 +89,6 @@ inline bool isnormal( double x)
 }
 */
 
-typedef unsigned int uintptr_t;
-
 
 // fix file names to use '/' instead of ':'
 char* ConvertFileName( const char* orgfilename);
@@ -99,6 +97,7 @@ char* ConvertFileName( const char* orgfilename, const char* junk);
 
 #define fopen(a, b) fopen(ConvertFileName(a), b);
 
+#ifndef __MINGW32__
 inline float abs(float f)
 {
     if (f < 0)
@@ -112,6 +111,7 @@ inline double abs(double f)
         return -f;
     return f;
 }
+#endif // __MINGW32__
 
 
 #endif