valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

some vs2005 fixes

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2363
This commit is contained in:
Peter Veenstra 2005-11-01 11:09:14 +00:00
parent 4f7f239142
commit 4a6719a725
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dos/cdrom_image.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: cdrom_image.cpp,v 1.9 2005-07-19 19:45:16 qbix79 Exp $ */
/* $Id: cdrom_image.cpp,v 1.10 2005-11-01 11:09:14 qbix79 Exp $ */
#include <cctype>
#include <cmath>
@ -391,7 +391,7 @@ bool CDROM_Interface_Image::CanReadPVD(TrackFile *file, int sectorSize, bool mod
}
#if defined(WIN32)
static string dirname(const char * file) {
static string dirname(char * file) {
char * sep = strrchr(file, '\\');
if (sep == NULL)
sep = strrchr(file, '/');

16
src/gui/sdlmain.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: sdlmain.cpp,v 1.90 2005-10-31 10:21:45 qbix79 Exp $ */
/* $Id: sdlmain.cpp,v 1.91 2005-11-01 11:09:14 qbix79 Exp $ */
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
@ -95,7 +95,7 @@ extern char** environ;
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#if defined(HAVE_DDRAW_H)
#if (HAVE_DDRAW_H)
#include <ddraw.h>
struct private_hwdata {
LPDIRECTDRAWSURFACE3 dd_surface;
@ -168,7 +168,7 @@ struct SDL_Block {
#endif
} opengl;
#endif
#if defined(HAVE_DDRAW_H) && defined(WIN32)
#if (HAVE_DDRAW_H) && defined(WIN32)
struct {
SDL_Surface * surface;
RECT rect;
@ -387,7 +387,7 @@ dosurface:
break;
}
break;
#if defined(HAVE_DDRAW_H) && defined(WIN32)
#if (HAVE_DDRAW_H) && defined(WIN32)
case SCREEN_SURFACE_DDRAW:
if (flags & CAN_16) bpp=16;
if (flags & CAN_32) bpp=32;
@ -579,7 +579,7 @@ bool GFX_StartUpdate(Bit8u * & pixels,Bitu & pitch) {
pixels+=sdl.clip.x*sdl.surface->format->BytesPerPixel;
pitch=sdl.surface->pitch;
return true;
#if defined(HAVE_DDRAW_H) && defined(WIN32)
#if (HAVE_DDRAW_H) && defined(WIN32)
case SCREEN_SURFACE_DDRAW:
if (SDL_LockSurface(sdl.blit.surface)) {
// LOG_MSG("SDL Lock failed");
@ -616,7 +616,7 @@ void GFX_EndUpdate(void) {
}
SDL_Flip(sdl.surface);
break;
#if defined(HAVE_DDRAW_H) && defined(WIN32)
#if (HAVE_DDRAW_H) && defined(WIN32)
case SCREEN_SURFACE_DDRAW:
if (SDL_MUSTLOCK(sdl.blit.surface)) {
SDL_UnlockSurface(sdl.blit.surface);
@ -847,7 +847,7 @@ static void GUI_StartUp(Section * sec) {
const char * output=section->Get_string("output");
if (!strcasecmp(output,"surface")) {
sdl.desktop.want_type=SCREEN_SURFACE;
#if defined(HAVE_DDRAW_H) && defined(WIN32)
#if (HAVE_DDRAW_H) && defined(WIN32)
} else if (!strcasecmp(output,"ddraw")) {
sdl.desktop.want_type=SCREEN_SURFACE_DDRAW;
#endif
@ -1107,7 +1107,7 @@ int main(int argc, char* argv[]) {
#if C_OPENGL
",opengl,openglnb"
#endif
#if defined(HAVE_DDRAW_H) && defined(WIN32)
#if (HAVE_DDRAW_H) && defined(WIN32)
",ddraw"
#endif
".\n"