diff options
author | 2016-03-02 21:49:49 +0100 | |
---|---|---|
committer | 2016-03-02 21:49:49 +0100 | |
commit | 9fe9f6d93e672bcd926f9e7461774bc9cc22e094 (patch) | |
tree | 3911b611dd010a4108b90fb8b8c82116eec21117 /src/lib/util/corestr.h | |
parent | dbdf21ee465acadf3e643d62d6bedfcc297ada85 (diff) | |
parent | 1914702e6fae052668df5b068a502bca57c9a3b0 (diff) |
Merge remote-tracking branch 'refs/remotes/mamedev/master'
# Resolved Conflicts:
# src/osd/modules/render/d3d/d3dhlsl.cpp
# src/osd/windows/winmain.cpp
Diffstat (limited to 'src/lib/util/corestr.h')
-rw-r--r-- | src/lib/util/corestr.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/lib/util/corestr.h b/src/lib/util/corestr.h index 94f13c4061b..29f98d06dc6 100644 --- a/src/lib/util/corestr.h +++ b/src/lib/util/corestr.h @@ -14,6 +14,10 @@ #define __CORESTR_H__ #include "osdcore.h" +#include "strformat.h" + +#include <string> + #include <string.h> @@ -57,18 +61,7 @@ char *core_strdup(const char *str); int core_strwildcmp(const char *sp1, const char *sp2); -/* I64 printf helper */ -char *core_i64_format(UINT64 value, UINT8 mindigits, bool is_octal); -char *core_i64_hex_format(UINT64 value, UINT8 mindigits); -char *core_i64_oct_format(UINT64 value, UINT8 mindigits); - -#include <string> - -int strvprintf(std::string &str, const char *format, va_list args); int strcatvprintf(std::string &str, const char *format, va_list args); -int strprintf(std::string &str, const char *format, ...) ATTR_PRINTF(2, 3); -int strcatprintf(std::string &str, const char *format, ...) ATTR_PRINTF(2, 3); -std::string strformat(const char *format, ...) ATTR_PRINTF(1, 2); void strdelchr(std::string& str, char chr); void strreplacechr(std::string& str, char ch, char newch); |