diff --git a/panda/src/express/crypto_utils.cxx b/panda/src/express/crypto_utils.cxx index 1b56bb4d25..f6a5d430b5 100644 --- a/panda/src/express/crypto_utils.cxx +++ b/panda/src/express/crypto_utils.cxx @@ -25,7 +25,10 @@ #include #include #include -#include + +// md5 defines this, but we'd rather do without it, because it +// conflicts with a similar macro defined in NSPR. +#undef IS_LITTLE_ENDIAN USING_NAMESPACE(CryptoPP); USING_NAMESPACE(std); diff --git a/panda/src/glutdisplay/Sources.pp b/panda/src/glutdisplay/Sources.pp index ba3e3a7983..e061e86f55 100644 --- a/panda/src/glutdisplay/Sources.pp +++ b/panda/src/glutdisplay/Sources.pp @@ -17,22 +17,3 @@ glutGraphicsPipe.h glutGraphicsWindow.h #end lib_target - -#begin test_bin_target - #define TARGET test_glut - #define LOCAL_LIBS \ - putil graph display mathutil gobj sgraph - - #define SOURCES \ - test_glut.cxx - -#end test_bin_target - -#begin test_bin_target - #define TARGET test_glut_win - - #define SOURCES \ - test_glut_win.cxx - -#end test_bin_target - diff --git a/panda/src/ipc/Sources.pp b/panda/src/ipc/Sources.pp index ac791d9194..290f39edcb 100644 --- a/panda/src/ipc/Sources.pp +++ b/panda/src/ipc/Sources.pp @@ -31,64 +31,3 @@ // when appropriate. Perhaps as simple as compiling it all the time, // but protecting the code itself within #ifdefs. #define EXTRA_DIST ipc_nt_traits.cxx - -// test_lib_target is not implemented yet. This is a bogus -// test_bin_target until then. -#begin test_bin_target - #define TARGET loom - - #define SOURCES \ - loom.cxx loom.h loom_internal.h - - #define LOCAL_LIBS ipc $[LOCAL_LIBS] -#end test_bin_target - - -#begin test_bin_target - #define TARGET test_diners - #define SOURCES test_diners.cxx - #define LOCAL_LIBS ipc $[LOCAL_LIBS] -#end test_bin_target - -#begin test_bin_target - #define TARGET test_priority - #define SOURCES test_priority.cxx - #define LOCAL_LIBS ipc $[LOCAL_LIBS] -#end test_bin_target - -#begin test_bin_target - #define TARGET test_prodcons - #define SOURCES test_prodcons.cxx - #define LOCAL_LIBS ipc $[LOCAL_LIBS] -#end test_bin_target - -#begin test_bin_target - #define TARGET test_threaddata - #define SOURCES test_threaddata.cxx - #define LOCAL_LIBS ipc $[LOCAL_LIBS] -#end test_bin_target - -#begin test_bin_target - #define TARGET loom_main - #define SOURCES loom_main.cxx - #define LOCAL_LIBS loom ipc $[LOCAL_LIBS] -#end test_bin_target - -#begin test_bin_target - #define TARGET test_file - #define SOURCES test_file.cxx - #define LOCAL_LIBS loom ipc $[LOCAL_LIBS] -#end test_bin_target - -// Oops, these are test .so's -#begin test_bin_target - #define TARGET loom_test1 - #define SOURCES loom_test1.cxx - #define LOCAL_LIBS loom ipc $[LOCAL_LIBS] -#end test_bin_target - -#begin test_bin_target - #define TARGET loom_test2 - #define SOURCES loom_test2.cxx - #define LOCAL_LIBS loom ipc $[LOCAL_LIBS] -#end test_bin_target diff --git a/panda/src/pnm/libpgm2.c b/panda/src/pnm/libpgm2.c index 21d0e18f0e..cbc8bb6ddb 100644 --- a/panda/src/pnm/libpgm2.c +++ b/panda/src/pnm/libpgm2.c @@ -13,7 +13,7 @@ #include "pgm.h" #include "libpgm.h" -static void putus ARGS((unsigned short n, FILE* file)); +static void putus1 ARGS((unsigned short n, FILE* file)); static void pgm_writepgmrowplain ARGS((FILE* file, gray* grayrow, int cols, gray maxval)); #ifdef PBMPLUS_RAWBITS static void pgm_writepgmrowraw ARGS((FILE* file, gray* grayrow, int cols, gray maxval)); @@ -51,12 +51,12 @@ pgm_writepgminit( file, cols, rows, maxval, forceplain ) } static void -putus( n, file ) +putus1( n, file ) unsigned short n; FILE* file; { if ( n >= 10 ) - putus((unsigned short)( n / 10), file ); + putus1((unsigned short)( n / 10), file ); (void) putc( n % 10 + '0', file ); } @@ -101,8 +101,8 @@ pgm_writepgmrowplain(FILE* file,gray* grayrow,int cols,gray maxval) if ( *gP > maxval ) pm_error( "value out of bounds (%u > %u)", *gP, maxval ); #endif /*DEBUG*/ -/* putus( (unsigned long) *gP, file ); */ - putus( (unsigned short) *gP, file ); +/* putus1( (unsigned long) *gP, file ); */ + putus1( (unsigned short) *gP, file ); charcount += 3; } if ( charcount > 0 ) diff --git a/panda/src/pnmimagetypes/color.c b/panda/src/pnmimagetypes/color.c index dfc4a608fe..cb6df36444 100644 --- a/panda/src/pnmimagetypes/color.c +++ b/panda/src/pnmimagetypes/color.c @@ -28,7 +28,7 @@ #include "color.h" -#ifdef WIN32VC +#ifdef WIN32_VC #include #endif @@ -43,7 +43,7 @@ void colr_color(register COLOR, register COLR); char * tempbuffer(unsigned len) /* get a temporary buffer */ { -#ifndef WIN32VC +#ifndef WIN32_VC extern char *malloc(size_t), *realloc(void *, size_t); #endif static char *tempbuf = NULL; diff --git a/panda/src/pnmimagetypes/colrops.c b/panda/src/pnmimagetypes/colrops.c index 26d5ec3d9d..b66014581d 100644 --- a/panda/src/pnmimagetypes/colrops.c +++ b/panda/src/pnmimagetypes/colrops.c @@ -22,10 +22,12 @@ #include "color.h" +#ifndef NULL #define NULL 0 +#endif #define bmalloc malloc -#ifndef WIN32VC +#ifndef WIN32_VC extern char *bmalloc(int); #else #include @@ -39,7 +41,7 @@ static BYTE *g_mant = NULL, *g_nexp = NULL; static BYTE (*g_bval)[256] = NULL; #ifndef pow -#ifndef WIN32VC +#ifndef WIN32_VC extern double pow(double, double); #endif #endif diff --git a/panda/src/putil/Sources.pp b/panda/src/putil/Sources.pp index 00e6343aaa..4e1a33d5e5 100644 --- a/panda/src/putil/Sources.pp +++ b/panda/src/putil/Sources.pp @@ -127,7 +127,7 @@ #begin test_bin_target #define TARGET test_bamRead #define LOCAL_LIBS \ - putil graph + putil pgraph #define SOURCES \ test_bam.cxx test_bam.h test_bamRead.cxx @@ -137,7 +137,7 @@ #begin test_bin_target #define TARGET test_bamWrite #define LOCAL_LIBS \ - putil graph + putil pgraph #define SOURCES \ test_bam.cxx test_bam.h test_bamWrite.cxx diff --git a/panda/src/wcrdisplay/Sources.pp b/panda/src/wcrdisplay/Sources.pp index 78625d0ee6..b8b74e5206 100644 --- a/panda/src/wcrdisplay/Sources.pp +++ b/panda/src/wcrdisplay/Sources.pp @@ -28,7 +28,7 @@ #begin test_bin_target #define TARGET test_wcr #define LOCAL_LIBS \ - putil graph display mathutil gobj sgraph wcrdisplay crgsg + putil display mathutil gobj pgraph wcrdisplay crgsg #define SOURCES \ test_wcr.cxx diff --git a/panda/src/wgldisplay/Sources.pp b/panda/src/wgldisplay/Sources.pp index fa6a36d76c..1720d67318 100644 --- a/panda/src/wgldisplay/Sources.pp +++ b/panda/src/wgldisplay/Sources.pp @@ -28,7 +28,7 @@ #begin test_bin_target #define TARGET test_wgl #define LOCAL_LIBS \ - putil graph display mathutil gobj sgraph wgldisplay glgsg + putil display mathutil gobj pgraph wgldisplay glgsg #define SOURCES \ test_wgl.cxx