[Opentnl-cvs] tnl/libtomcrypt mycrypt_custom.h,1.1,1.2
Brought to you by:
mark_frohnmayer,
s_alanet
From: Mark F. <mar...@us...> - 2004-09-28 18:46:05
|
Update of /cvsroot/opentnl/tnl/libtomcrypt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14491/libtomcrypt Modified Files: mycrypt_custom.h Log Message: Integrated Norbert's patch for Win32 CodeWarrior support Changed instructions screen to display help for current controls configuration Index: mycrypt_custom.h =================================================================== RCS file: /cvsroot/opentnl/tnl/libtomcrypt/mycrypt_custom.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mycrypt_custom.h 20 Apr 2004 04:27:14 -0000 1.1 --- mycrypt_custom.h 28 Sep 2004 18:45:23 -0000 1.2 *************** *** 10,17 **** --- 10,26 ---- #endif + #if defined(__MWERKS__) && defined(__cplusplus) + // codewarrior needs namespace version for c++ (otherwise we get ambiguity errors) + #include <stdlib.h> + #define XMALLOC std::malloc + #define XREALLOC std::realloc + #define XCALLOC std::calloc + #define XFREE std::free + #else #define XMALLOC malloc #define XREALLOC realloc #define XCALLOC calloc #define XFREE free + #endif #define XCLOCK clock #define XCLOCKS_PER_SEC CLOCKS_PER_SEC |