From 8a79d1589235adaf32ea19fd05ce70d65ecb3967 Mon Sep 17 00:00:00 2001 From: Martin Schaffner Date: Fri, 6 Aug 2004 20:36:02 +0000 Subject: [PATCH] make d2x compile (but not link) on MPW on Mac OS 9 (carbon) --- ChangeLog | 3 +++ arch/ogl/gr.c | 4 ++-- cfile/cfile.c | 7 +------ main/movie.c | 6 +++--- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index c98df414..fd19fbac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ * include/strio.h, include/strutil.h, misc/args.c, misc/strio.c, misc/strutil.c: d2x can now handle any line ending when reading d2x.ini + * arch/ogl/gr.c, cfile/cfile.c, main/movie.c: make d2x compile (but not + link) on MPW on Mac OS 9 (carbon) + 2004-08-04 Chris Taylor * include/ogl_init.h: Include glu.h on OS X, it is sometimes necessary diff --git a/arch/ogl/gr.c b/arch/ogl/gr.c index eddd31bd..3b688a7f 100644 --- a/arch/ogl/gr.c +++ b/arch/ogl/gr.c @@ -1,4 +1,4 @@ -/* $Id: gr.c,v 1.34 2004-08-01 16:28:33 schaffner Exp $ */ +/* $Id: gr.c,v 1.35 2004-08-06 20:36:02 schaffner Exp $ */ /* * * OGL video functions. - Added 9/15/99 Matthew Mueller @@ -320,7 +320,7 @@ return 0; // ogl_init_state(); - gr_bm_data=grd_curscreen->sc_canvas.cv_bitmap.bm_data;//since we use realloc, we want to keep this pointer around. + gr_bm_data=(char *)grd_curscreen->sc_canvas.cv_bitmap.bm_data;//since we use realloc, we want to keep this pointer around. memset( grd_curscreen, 0, sizeof(grs_screen)); grd_curscreen->sc_mode = mode; grd_curscreen->sc_w = w; diff --git a/cfile/cfile.c b/cfile/cfile.c index dd53d810..a177e356 100644 --- a/cfile/cfile.c +++ b/cfile/cfile.c @@ -1,4 +1,4 @@ -/* $Id: cfile.c,v 1.24 2004-08-01 14:32:07 schaffner Exp $ */ +/* $Id: cfile.c,v 1.25 2004-08-06 20:36:02 schaffner Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -125,11 +125,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include -#ifndef _WIN32_WCE -#include -#else -# include -#endif #include "pstypes.h" #include "u_mem.h" diff --git a/main/movie.c b/main/movie.c index 167ab7eb..0fde764a 100644 --- a/main/movie.c +++ b/main/movie.c @@ -1,4 +1,4 @@ -/* $Id: movie.c,v 1.35 2004-08-01 16:28:33 schaffner Exp $ */ +/* $Id: movie.c,v 1.36 2004-08-06 20:36:02 schaffner Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: movie.c,v 1.35 2004-08-01 16:28:33 schaffner Exp $"; +static char rcsid[] = "$Id: movie.c,v 1.36 2004-08-06 20:36:02 schaffner Exp $"; #endif #define DEBUG_LEVEL CON_NORMAL @@ -546,7 +546,7 @@ int init_subtitles(char *filename) size = cfilelength(ifile); - MALLOC (subtitle_raw_data, ubyte, size+1); + MALLOC (subtitle_raw_data, char, size+1); read_count = cfread(subtitle_raw_data, 1, size, ifile); -- 2.39.2