remove a few #include <windows.h>
also #include <direct.h>
This commit is contained in:
		
							parent
							
								
									9847110fe4
								
							
						
					
					
						commit
						811cb619b6
					
				@ -24,8 +24,6 @@
 | 
				
			|||||||
#if defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__)
 | 
					#if defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__)
 | 
				
			||||||
    #include <proto/dos.h>
 | 
					    #include <proto/dos.h>
 | 
				
			||||||
    #include <sys/types.h>
 | 
					    #include <sys/types.h>
 | 
				
			||||||
#elif defined(__WIN32__) || defined(WIN32)
 | 
					 | 
				
			||||||
    #include <windows.h>
 | 
					 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <fcntl.h>
 | 
					#include <fcntl.h>
 | 
				
			||||||
@ -89,7 +87,6 @@
 | 
				
			|||||||
#ifndef _MSC_VER
 | 
					#ifndef _MSC_VER
 | 
				
			||||||
    #include <dirent.h>
 | 
					    #include <dirent.h>
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
    #include <windows.h>
 | 
					 | 
				
			||||||
#else
 | 
					#else
 | 
				
			||||||
    #include <dirent.h>
 | 
					    #include <dirent.h>
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
				
			|||||||
@ -31,8 +31,8 @@
 | 
				
			|||||||
#elif defined (__MINT__)
 | 
					#elif defined (__MINT__)
 | 
				
			||||||
    #include <mint/sysbind.h>
 | 
					    #include <mint/sysbind.h>
 | 
				
			||||||
#elif defined(WIN32)
 | 
					#elif defined(WIN32)
 | 
				
			||||||
    #include <windows.h>
 | 
					    //#include <windows.h>  // Native_filesel() is currently disabled
 | 
				
			||||||
    #include <commdlg.h>
 | 
					    //#include <commdlg.h>
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <assert.h>
 | 
					#include <assert.h>
 | 
				
			||||||
@ -87,6 +87,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
// -- Native fileselector for WIN32
 | 
					// -- Native fileselector for WIN32
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if 0 // Native fileselector is disabled
 | 
				
			||||||
// Returns 0 if all ok, something else if failed
 | 
					// Returns 0 if all ok, something else if failed
 | 
				
			||||||
byte Native_filesel(byte load)
 | 
					byte Native_filesel(byte load)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
@ -135,6 +136,7 @@ byte Native_filesel(byte load)
 | 
				
			|||||||
    return 255; // fail !
 | 
					    return 255; // fail !
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// -- "Standard" fileselector for other platforms
 | 
					// -- "Standard" fileselector for other platforms
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -32,7 +32,6 @@
 | 
				
			|||||||
#if defined(__WIN32__) || defined(WIN32)
 | 
					#if defined(__WIN32__) || defined(WIN32)
 | 
				
			||||||
  #include <windows.h>
 | 
					  #include <windows.h>
 | 
				
			||||||
#ifdef _MSC_VER
 | 
					#ifdef _MSC_VER
 | 
				
			||||||
  #include <direct.h>
 | 
					 | 
				
			||||||
  #define strdup _strdup
 | 
					  #define strdup _strdup
 | 
				
			||||||
  #if _MSC_VER < 1900
 | 
					  #if _MSC_VER < 1900
 | 
				
			||||||
    #define snprintf _snprintf
 | 
					    #define snprintf _snprintf
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user