diff options
author | 2017-12-01 13:22:27 +0100 | |
---|---|---|
committer | 2017-12-01 13:22:27 +0100 | |
commit | 39176274946d70ff520f265dee8fbd16d5fe0000 (patch) | |
tree | 318801d93146752050c9a492654ae3738820e3b9 /3rdparty/bx/src/crtnone.cpp | |
parent | 6829ecb3b037d6bfbe0b84e818d17d712f71bce6 (diff) |
Updated GENie, BGFX, BX, added BIMG since it is separated now, updated all shader binaries and MAME part of code to support new interfaces [Miodrag Milanovic]
Diffstat (limited to '3rdparty/bx/src/crtnone.cpp')
-rw-r--r-- | 3rdparty/bx/src/crtnone.cpp | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/3rdparty/bx/src/crtnone.cpp b/3rdparty/bx/src/crtnone.cpp index 0e88551b6f3..85028212133 100644 --- a/3rdparty/bx/src/crtnone.cpp +++ b/3rdparty/bx/src/crtnone.cpp @@ -3,6 +3,7 @@ * License: https://github.com/bkaradzic/bx#license-bsd-2-clause */ +#include "bx_p.h" #include <bx/debug.h> #include <bx/sort.h> #include <bx/readerwriter.h> @@ -39,50 +40,50 @@ extern "C" int32_t memcmp(const void* _lhs, const void* _rhs, size_t _numBytes) extern "C" size_t strlen(const char* _str) { - return bx::strnlen(_str); + return bx::strLen(_str); } extern "C" size_t strnlen(const char* _str, size_t _max) { - return bx::strnlen(_str, _max); + return bx::strLen(_str, _max); } extern "C" void* strcpy(char* _dst, const char* _src) { - bx::strlncpy(_dst, INT32_MAX, _src, INT32_MAX); + bx::strCopy(_dst, INT32_MAX, _src, INT32_MAX); return _dst; } extern "C" void* strncpy(char* _dst, const char* _src, size_t _num) { - bx::strlncpy(_dst, INT32_MAX, _src, _num); + bx::strCopy(_dst, INT32_MAX, _src, _num); return _dst; } extern "C" char* strcat(char* _dst, const char* _src) { - bx::strlncat(_dst, INT32_MAX, _src, INT32_MAX); + bx::strCat(_dst, INT32_MAX, _src, INT32_MAX); return _dst; } extern "C" const char* strchr(const char* _str, int _ch) { - return bx::strnchr(_str, _ch); + return bx::strFind(_str, _ch); } extern "C" int32_t strcmp(const char* _lhs, const char* _rhs) { - return bx::strncmp(_lhs, _rhs); + return bx::strCmp(_lhs, _rhs); } extern "C" int32_t strncmp(const char* _lhs, const char* _rhs, size_t _max) { - return bx::strncmp(_lhs, _rhs, _max); + return bx::strCmp(_lhs, _rhs, _max); } extern "C" const char* strstr(const char* _str, const char* _find) { - return bx::strnstr(_str, _find); + return bx::strFind(_str, _find); } extern "C" void qsort(void* _base, size_t _num, size_t _size, bx::ComparisonFn _fn) @@ -244,14 +245,16 @@ extern "C" float fmodf(float _numer, float _denom) extern "C" int atoi(const char* _str) { - BX_UNUSED(_str); - return 0; + int32_t result = 0; + bx::fromString(&result, _str); + return result; } extern "C" double atof(const char* _str) { - BX_UNUSED(_str); - return 0.0; + double result = 0.0; + bx::fromString(&result, _str); + return result; } extern "C" struct DIR* opendir(const char* dirname) @@ -301,6 +304,10 @@ extern "C" int printf(const char* _format, ...) return -1; } +struct FILE +{ +}; + extern "C" int fprintf(FILE* _stream, const char* _format, ...) { BX_UNUSED(_stream, _format); |