bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix DJGPP build (GCC 2.x). Bugreport from Max Vasilyev 2:5057/77

Browse Source
This commit is contained in:
Stas Degteff
2011-03-02 08:54:12 +00:00
parent 449a750688
commit 92626bd967
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
goldlib/gall/gstrall.h
View File

@@ -35,8 +35,12 @@
#include <string>
#include <vector>
#include <stdlib.h>
#include <gctype.h>
#include <cstring>
#if defined(HAVE_STDARG_H)
# include <stdarg.h>
#endif
#include <gctype.h>
#include <gdefs.h>
// ------------------------------------------------------------------

8
goldlib/gall/gstrutil.cpp
View File

@@ -68,7 +68,7 @@ int vsnprintf( char *buffer, size_t sizeOfBuffer, const char *format, va_list ar
#endif
#if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF)
# include snprintf.c
# include "snprintf.c"
#endif
//--------------------------------------------------------------------
@@ -726,8 +726,8 @@ int gsprintf(TCHAR* buffer, size_t sizeOfBuffer, const TCHAR* __file, int __line
if (!buffer || !format)
{
LOG.errpointer(__file, __line);
LOG.printf( "! Parameter is NULL pointer: gsprintf(%s,%i,%s,...).",
(buffer?"buffer":"NULL"), sizeOfBuffer, (format?"format":"NULL") );
LOG.printf( "! Parameter is NULL pointer: gsprintf(%s,%ul,%s,...).",
(buffer?"buffer":"NULL"), (unsigned long)sizeOfBuffer, (format?"format":"NULL") );
PointerErrorExit();
return -1;
}
@@ -741,7 +741,7 @@ int gsprintf(TCHAR* buffer, size_t sizeOfBuffer, const TCHAR* __file, int __line
if (!*format)
{
LOG.errtest(__file, __line);
LOG.printf("! Format is empty string: gsprintf(buffer,%i,"",...).", sizeOfBuffer);
LOG.printf("! Format is empty string: gsprintf(buffer,%ul,"",...).", (unsigned long)sizeOfBuffer);
return 0;
}

6
goldlib/gall/snprintf.c
View File

@@ -350,8 +350,10 @@ static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
fmtstr (buffer, &currlen, maxlen, strvalue, flags, min, max);
break;
case 'p':
strvalue = va_arg (args, void *);
fmtint (buffer, &currlen, maxlen, (long) strvalue, 16, min, max, flags);
{
void * value = va_arg (args, void *);
fmtint (buffer, &currlen, maxlen, (long) value, 16, min, max, flags);
}
break;
case 'n':
if (cflags == DP_C_SHORT)