Changes to make libbitdht compile on OSX.

- changed <malloc.h> => <stdlib.h>
	- put #ifdef __cplusplus protection in bdstring.h so it can be used by C modules.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5231 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-06-19 10:36:48 +00:00
parent 8ef3d851de
commit ede890417e
2 changed files with 8 additions and 5 deletions

View File

@ -25,7 +25,7 @@
#include <windows.h>
#else
#include <stdarg.h>
#include <malloc.h>
#include <stdlib.h>
#endif
#include <stdio.h>

View File

@ -22,8 +22,6 @@
* Boston, MA 02110-1301, USA.
****************************************************************/
#include <string>
#ifdef WIN32
// for proper handling of %ll
#define bd_snprintf __mingw_snprintf
@ -33,7 +31,12 @@
#define bd_fprintf fprintf
#endif
int bd_sprintf(std::string &str, const char *fmt, ...);
int bd_sprintf_append(std::string &str, const char *fmt, ...);
#ifdef __cplusplus
// These definitions are only available for C++ Modules.
#include <string>
int bd_sprintf(std::string &str, const char *fmt, ...);
int bd_sprintf_append(std::string &str, const char *fmt, ...);
#endif
#endif