v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

snprintf-replacement: fix invalid preprocessor defines for compiler 

detection on windows for older vs-versions
pull/749/head
Kim Kulling 2016-01-06 19:55:04 +01:00
parent d43a083dc1
commit 56a77b2429
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
code/StringUtils.h
View File

@ -44,8 +44,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
//namespace Assimp {
/// @fn ai_snprintf /// @fn ai_snprintf
/// @brief The portable version of the function snprintf ( C99 standard ), which works on visual studio compilers 2013 and earlier. /// @brief The portable version of the function snprintf ( C99 standard ), which works on visual studio compilers 2013 and earlier.
/// @param outBuf The buffer to write in /// @param outBuf The buffer to write in
@ -53,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/// @param format The format string /// @param format The format string
/// @param ap The additional arguments. /// @param ap The additional arguments.
/// @return The number of written characters if the buffer size was big enough. If an encoding error occurs, a negative number is returned. /// @return The number of written characters if the buffer size was big enough. If an encoding error occurs, a negative number is returned.
//#if defined(_MSC_VER) && _MSC_VER < 1900 #if defined(_MSC_VER) && _MSC_VER < 1900
inline int c99_ai_vsnprintf(char *outBuf, size_t size, const char *format, va_list ap) { inline int c99_ai_vsnprintf(char *outBuf, size_t size, const char *format, va_list ap) {
int count(-1); int count(-1);
@ -67,8 +65,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
return count; return count;
} }
#if defined(_MSC_VER) && _MSC_VER < 1900
inline int ai_snprintf(char *outBuf, size_t size, const char *format, ...) { inline int ai_snprintf(char *outBuf, size_t size, const char *format, ...) {
int count; int count;
va_list ap; va_list ap;
@ -82,20 +78,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#else #else
# define ai_snprintf snprintf # define ai_snprintf snprintf
/*inline int ai_snprintf(char *outBuf, size_t size, const char *format, ...) {
int count;
va_list args;
va_start(args, format);
count = c99_ai_vsnprintf(outBuf, size, format, args);
// count = ::snprintf(outBuf, size, format, args);
va_end(args);
return count;
}*/
#endif #endif
//} // Namespace Assimp
#endif // INCLUDED_AI_STRINGUTILS_H #endif // INCLUDED_AI_STRINGUTILS_H