From: curt Date: Tue, 3 Feb 1998 23:20:27 +0000 (+0000) Subject: Lots of little tweaks to fix various consistency problems discovered by X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=331f91ba431a1d343bfbf9658ffb99bea5574f9f;p=simgear.git Lots of little tweaks to fix various consistency problems discovered by Solaris' CC. Fixed a bug in fg_debug.c with how the fgPrintf() wrapper passed arguments along to the real printf(). Also incorporated HUD changes by Michele America. --- diff --git a/Math/MAT3mat.c b/Math/MAT3mat.c index f25310f0..d827cf94 100644 --- a/Math/MAT3mat.c +++ b/Math/MAT3mat.c @@ -5,15 +5,14 @@ * This file contains routines that operate solely on matrices. * -------------------------------------------------------------------------*/ -#include -#include - #ifdef WIN32 # include /* required for memset() and memcpy() */ -#elif __MWERKS__ -# include /* MetroWerks CodeWarrior: memset() & memcpy() */ #endif +#include +#include + +#define USE_MEM /* #include "macros.h" */ @@ -33,8 +32,8 @@ MAT3identity (register MAT3mat mat) { register int i; -#ifdef WIN32 - memset(mat,0x00, sizeof(MAT3mat)); +#ifdef USE_MEM /* WIN32 */ + memset(mat, 0x00, sizeof(MAT3mat)); #else bzero (mat, sizeof(MAT3mat)); #endif @@ -50,7 +49,7 @@ MAT3identity (register MAT3mat mat) void MAT3zero (MAT3mat mat) { -#ifdef WIN32 +#ifdef USE_MEM /* WIN32 */ memset(mat,0x00, sizeof(MAT3mat)); #else bzero (mat, sizeof(MAT3mat)); @@ -65,7 +64,7 @@ MAT3zero (MAT3mat mat) void MAT3copy(MAT3mat to, MAT3mat from) { -#ifdef WIN32 +#ifdef USE_MEM /* WIN32 */ memcpy(to, from, sizeof(MAT3mat)); #else bcopy(from, to, sizeof(MAT3mat)); diff --git a/Math/fg_random.c b/Math/fg_random.c index 73ed67f1..ce734f56 100644 --- a/Math/fg_random.c +++ b/Math/fg_random.c @@ -38,6 +38,13 @@ # endif #endif +#ifdef __SUNPRO_CC + extern "C" { + long int random(void); + void srandom(unsigned int seed); + } +#endif + /* Seed the random number generater with time() so we don't see the * same sequence every time */ @@ -63,10 +70,16 @@ double fg_random(void) { /* $Log$ -/* Revision 1.3 1998/01/27 00:47:59 curt -/* Incorporated Paul Bleisch's new debug message -/* system and commandline/config file processing code. +/* Revision 1.4 1998/02/03 23:20:28 curt +/* Lots of little tweaks to fix various consistency problems discovered by +/* Solaris' CC. Fixed a bug in fg_debug.c with how the fgPrintf() wrapper +/* passed arguments along to the real printf(). Also incorporated HUD changes +/* by Michele America. /* + * Revision 1.3 1998/01/27 00:47:59 curt + * Incorporated Paul Bleisch's new debug message + * system and commandline/config file processing code. + * * Revision 1.2 1997/12/30 20:47:48 curt * Integrated new event manager with subsystem initializations. * diff --git a/XGL/xglUtils.c b/XGL/xglUtils.c index 6be1e6fa..33331e55 100644 --- a/XGL/xglUtils.c +++ b/XGL/xglUtils.c @@ -12,6 +12,8 @@ # include #endif +#include + #include "xgl.h" #ifndef TRUE