fix compiler warnings w/opengl
This commit is contained in:
parent
9eb57ce522
commit
281925bb11
|
@ -12,13 +12,16 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
||||||
*/
|
*/
|
||||||
/*
|
/*
|
||||||
* $Source: /cvs/cvsroot/d2x/include/error.h,v $
|
* $Source: /cvs/cvsroot/d2x/include/error.h,v $
|
||||||
* $Revision: 1.1.1.1 $
|
* $Revision: 1.2 $
|
||||||
* $Author: bradleyb $
|
* $Author: bradleyb $
|
||||||
* $Date: 2001-01-19 03:30:16 $
|
* $Date: 2001-01-22 15:49:14 $
|
||||||
*
|
*
|
||||||
* Header for error handling/printing/exiting code
|
* Header for error handling/printing/exiting code
|
||||||
*
|
*
|
||||||
* $Log: not supported by cvs2svn $
|
* $Log: not supported by cvs2svn $
|
||||||
|
* Revision 1.1.1.1 2001/01/19 03:30:16 bradleyb
|
||||||
|
* Import of d2x-0.0.8
|
||||||
|
*
|
||||||
* Revision 1.3 1999/10/14 04:48:21 donut
|
* Revision 1.3 1999/10/14 04:48:21 donut
|
||||||
* alpha fixes, and gl_font args
|
* alpha fixes, and gl_font args
|
||||||
*
|
*
|
||||||
|
@ -69,6 +72,11 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifndef _ERROR_H
|
||||||
|
#define _ERROR_H
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
#define __noreturn __attribute__ ((noreturn))
|
#define __noreturn __attribute__ ((noreturn))
|
||||||
#define __format __attribute__ ((format (printf, 1, 2)))
|
#define __format __attribute__ ((format (printf, 1, 2)))
|
||||||
|
@ -144,3 +152,5 @@ void Int3(void); //generate int3
|
||||||
#define Int3() ((void)0)
|
#define Int3() ((void)0)
|
||||||
//void Int3();
|
//void Int3();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif /* _ERROR_H */
|
||||||
|
|
|
@ -14,6 +14,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
||||||
#ifndef _MONO_H
|
#ifndef _MONO_H
|
||||||
#define _MONO_H
|
#define _MONO_H
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include "console.h"
|
#include "console.h"
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef RCS
|
#ifdef RCS
|
||||||
char game_rcsid[] = "$Id: game.c,v 1.2 2001-01-20 13:49:14 bradleyb Exp $";
|
char game_rcsid[] = "$Id: game.c,v 1.3 2001-01-22 15:49:14 bradleyb Exp $";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef WINDOWS
|
#ifdef WINDOWS
|
||||||
|
@ -108,6 +108,10 @@ char game_rcsid[] = "$Id: game.c,v 1.2 2001-01-20 13:49:14 bradleyb Exp $";
|
||||||
#include "playsave.h"
|
#include "playsave.h"
|
||||||
#include "fix.h"
|
#include "fix.h"
|
||||||
|
|
||||||
|
#ifdef OGL
|
||||||
|
#include "ogl_init.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
int VGA_current_mode;
|
int VGA_current_mode;
|
||||||
|
|
||||||
#ifdef MWPROFILER
|
#ifdef MWPROFILER
|
||||||
|
|
|
@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
||||||
|
|
||||||
|
|
||||||
#ifdef RCS
|
#ifdef RCS
|
||||||
static char rcsid[] = "$Id: gamerend.c,v 1.2 2001-01-20 13:49:15 bradleyb Exp $";
|
static char rcsid[] = "$Id: gamerend.c,v 1.3 2001-01-22 15:49:15 bradleyb Exp $";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -63,6 +63,10 @@ static char rcsid[] = "$Id: gamerend.c,v 1.2 2001-01-20 13:49:15 bradleyb Exp $"
|
||||||
#include "poly_acc.h"
|
#include "poly_acc.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef OGL
|
||||||
|
#include "ogl_init.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
extern fix Cruise_speed;
|
extern fix Cruise_speed;
|
||||||
extern int LinearSVGABuffer;
|
extern int LinearSVGABuffer;
|
||||||
extern int Current_display_mode;
|
extern int Current_display_mode;
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#include "powerup.h"
|
#include "powerup.h"
|
||||||
#include "polyobj.h"
|
#include "polyobj.h"
|
||||||
#include "gamefont.h"
|
#include "gamefont.h"
|
||||||
|
#include "grdef.h"
|
||||||
|
|
||||||
#ifndef M_PI
|
#ifndef M_PI
|
||||||
#define M_PI 3.14159
|
#define M_PI 3.14159
|
||||||
|
|
Loading…
Reference in a new issue