screen.h: remove #include <windows.h>
This commit is contained in:
		
							parent
							
								
									811cb619b6
								
							
						
					
					
						commit
						3551f6bbc6
					
				@ -61,6 +61,9 @@ char * Bound_script[10];
 | 
			
		||||
#include <limits.h> //for INT_MIN
 | 
			
		||||
#include <string.h> // strncpy()
 | 
			
		||||
#include <stdlib.h> // for atof()
 | 
			
		||||
#if defined(WIN32)
 | 
			
		||||
#include <windows.h>
 | 
			
		||||
#endif
 | 
			
		||||
#if defined(_MSC_VER)
 | 
			
		||||
#define strdup _strdup
 | 
			
		||||
#define putenv _putenv
 | 
			
		||||
 | 
			
		||||
@ -31,7 +31,7 @@
 | 
			
		||||
#elif defined (__MINT__)
 | 
			
		||||
    #include <mint/sysbind.h>
 | 
			
		||||
#elif defined(WIN32)
 | 
			
		||||
    //#include <windows.h>  // Native_filesel() is currently disabled
 | 
			
		||||
    #include <windows.h>  // Native_filesel() is currently disabled
 | 
			
		||||
    //#include <commdlg.h>
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -50,8 +50,8 @@
 | 
			
		||||
#if defined(USE_SDL)
 | 
			
		||||
#include <SDL_byteorder.h>
 | 
			
		||||
#endif
 | 
			
		||||
#if defined(WIN32)
 | 
			
		||||
  #include <windows.h> // GetLogicalDrives(), GetDriveType(), DRIVE_*
 | 
			
		||||
#if defined(WIN32) && !defined(USE_SDL) && !defined(USE_SDL2)
 | 
			
		||||
#include <windows.h>
 | 
			
		||||
#endif
 | 
			
		||||
#if defined (__MINT__)
 | 
			
		||||
  #include <mint/osbind.h>
 | 
			
		||||
 | 
			
		||||
@ -29,9 +29,6 @@
 | 
			
		||||
#ifndef SCREEN_H_INCLUDED
 | 
			
		||||
#define SCREEN_H_INCLUDED
 | 
			
		||||
 | 
			
		||||
#ifdef WIN32
 | 
			
		||||
#include <windows.h>  // for HWND
 | 
			
		||||
#endif
 | 
			
		||||
#if defined(USE_SDL) || defined(USE_SDL2)
 | 
			
		||||
#include <SDL.h>
 | 
			
		||||
#if defined(SDL_VIDEO_DRIVER_X11)
 | 
			
		||||
@ -76,7 +73,10 @@ void GFX2_UpdateScreen(void);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if defined(WIN32)
 | 
			
		||||
HWND GFX2_Get_Window_Handle(void);
 | 
			
		||||
/**
 | 
			
		||||
 * @return a HWND (casted to void *)
 | 
			
		||||
 */
 | 
			
		||||
void * GFX2_Get_Window_Handle(void);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if defined(USE_X11) || defined(SDL_VIDEO_DRIVER_X11)
 | 
			
		||||
 | 
			
		||||
@ -534,7 +534,7 @@ void Clear_border(byte color)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#ifdef WIN32
 | 
			
		||||
HWND GFX2_Get_Window_Handle(void)
 | 
			
		||||
void * GFX2_Get_Window_Handle(void)
 | 
			
		||||
{
 | 
			
		||||
  SDL_SysWMinfo wminfo;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -49,7 +49,7 @@ static int Windows_DIB_height = 0;
 | 
			
		||||
static HWND Win32_hwnd = NULL;
 | 
			
		||||
static int Win32_Is_Fullscreen = 0;
 | 
			
		||||
 | 
			
		||||
HWND GFX2_Get_Window_Handle()
 | 
			
		||||
void * GFX2_Get_Window_Handle()
 | 
			
		||||
{
 | 
			
		||||
  return Win32_hwnd;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user