mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
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:
parent
8ef3d851de
commit
ede890417e
@ -25,7 +25,7 @@
|
||||
#include <windows.h>
|
||||
#else
|
||||
#include <stdarg.h>
|
||||
#include <malloc.h>
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
#include <stdio.h>
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user