diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-12-18 06:59:39 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-12-18 06:59:39 +0000 |
| commit | 6b7cf13200f58560d2a7ff9fbdf87ffd69ac6d44 (patch) | |
| tree | 72a3a93e772c2b636f9a8d1791ff407fcee6d344 | |
| parent | c29d0f31b48bc26e0354388aef05ac2792a03333 (diff) | |
| download | postgresql-6b7cf13200f58560d2a7ff9fbdf87ffd69ac6d44.tar.gz postgresql-6b7cf13200f58560d2a7ff9fbdf87ffd69ac6d44.zip | |
Fix for snprintf with long long's, define problem.
| -rw-r--r-- | src/backend/port/snprintf.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/backend/port/snprintf.c b/src/backend/port/snprintf.c index 1b7482683a5..3ecd4af46fb 100644 --- a/src/backend/port/snprintf.c +++ b/src/backend/port/snprintf.c @@ -49,7 +49,7 @@ #include <sys/param.h> /* IRIX doesn't do 'long long' in va_arg(), so use a typedef */ -#ifdef HAVE_LONG_INT_64 +#ifdef HAVE_LONG_LONG_INT_64 typedef long long long_long; #endif @@ -75,7 +75,7 @@ typedef long long long_long; * causing nast effects. **************************************************************/ -/*static char _id[] = "$Id: snprintf.c,v 1.11 1998/12/12 21:30:57 momjian Exp $";*/ +/*static char _id[] = "$Id: snprintf.c,v 1.12 1998/12/18 06:59:39 momjian Exp $";*/ static char *end; static int SnprfOverflow; @@ -122,7 +122,7 @@ vsnprintf(char *str, size_t count, const char *fmt,...) static void fmtstr __P((char *value, int ljust, int len, int zpad, int maxwidth)); -#ifndef HAVE_LONG_INT_64 +#ifndef HAVE_LONG_LONG_INT_64 static void fmtnum __P((long value, int base, int dosign, int ljust, int len, int zpad)); #else static void fmtnum __P((long_long value, int base, int dosign, int ljust, int len, int zpad)); @@ -136,7 +136,7 @@ static void dopr(char *buffer, const char *format,...) { int ch; -#ifdef HAVE_LONG_INT_64 +#ifdef HAVE_LONG_LONG_INT_64 long_long value; #else long value; @@ -215,7 +215,7 @@ dopr(char *buffer, const char *format,...) /* fmtnum(value,base,dosign,ljust,len,zpad) */ if (longflag) { -#ifdef HAVE_LONG_INT_64 +#ifdef HAVE_LONG_LONG_INT_64 if (longlongflag) value = va_arg(args, long_long); else @@ -231,7 +231,7 @@ dopr(char *buffer, const char *format,...) /* fmtnum(value,base,dosign,ljust,len,zpad) */ if (longflag) { -#ifdef HAVE_LONG_INT_64 +#ifdef HAVE_LONG_LONG_INT_64 if (longlongflag) value = va_arg(args, long_long); else @@ -246,7 +246,7 @@ dopr(char *buffer, const char *format,...) case 'D': if (longflag) { -#ifdef HAVE_LONG_INT_64 +#ifdef HAVE_LONG_LONG_INT_64 if (longlongflag) value = va_arg(args, long_long); else @@ -260,7 +260,7 @@ dopr(char *buffer, const char *format,...) case 'x': if (longflag) { -#ifdef HAVE_LONG_INT_64 +#ifdef HAVE_LONG_LONG_INT_64 if (longlongflag) value = va_arg(args, long_long); else @@ -274,7 +274,7 @@ dopr(char *buffer, const char *format,...) case 'X': if (longflag) { -#ifdef HAVE_LONG_INT_64 +#ifdef HAVE_LONG_LONG_INT_64 if (longlongflag) value = va_arg(args, long_long); else @@ -350,7 +350,7 @@ int ljust, static void fmtnum(value, base, dosign, ljust, len, zpad) -#ifdef HAVE_LONG_INT_64 +#ifdef HAVE_LONG_LONG_INT_64 long_long value; #else long value; @@ -362,8 +362,8 @@ int base, zpad; { int signvalue = 0; -#ifdef HAVE_LONG_INT_64 - unsigned long long uvalue; +#ifdef HAVE_LONG_LONG_INT_64 + unsigned long_long uvalue; #else unsigned long uvalue; #endif |