summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-08-28 14:00:54 +1000
committerDamien Miller <djm@mindrot.org>2013-08-28 14:00:54 +1000
commit43968a8e66a0aa1afefb11665bf96f86b113f5d9 (patch)
tree6ac1451c03aae63912b780466b86757789767728
parent04be8b9e53f8388c94b531ebc5d1bd6e10e930d1 (diff)
- (djm) [openbsd-compat/bsd-snprintf.c] #ifdef noytet for intmax_t bits
until we have configure support.
-rw-r--r--ChangeLog2
-rw-r--r--openbsd-compat/bsd-snprintf.c6
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 97881822..0ddb0a35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
- (djm) [openbsd-compat/bsd-snprintf.c] teach our local snprintf code the
'j' (intmax_t/uintmax_t) and 'z' (size_t/ssize_t) conversions in case we
start to use them in the future.
+ - (djm) [openbsd-compat/bsd-snprintf.c] #ifdef noytet for intmax_t bits
+ until we have configure support.
20130821
- (djm) OpenBSD CVS Sync
diff --git a/openbsd-compat/bsd-snprintf.c b/openbsd-compat/bsd-snprintf.c
index 308078e0..975991e7 100644
--- a/openbsd-compat/bsd-snprintf.c
+++ b/openbsd-compat/bsd-snprintf.c
@@ -344,8 +344,10 @@ dopr(char *buffer, size_t maxlen, const char *format, va_list args_in)
value = (long)va_arg (args, unsigned LLONG);
else if (cflags == DP_C_SIZE)
value = va_arg (args, size_t);
+#ifdef notyet
else if (cflags == DP_C_INTMAX)
value = va_arg (args, uintmax_t);
+#endif
else
value = (long)va_arg (args, unsigned int);
if (fmtint(buffer, &currlen, maxlen, value,
@@ -362,8 +364,10 @@ dopr(char *buffer, size_t maxlen, const char *format, va_list args_in)
value = (LLONG)va_arg (args, unsigned LLONG);
else if (cflags == DP_C_SIZE)
value = va_arg (args, size_t);
+#ifdef notyet
else if (cflags == DP_C_INTMAX)
value = va_arg (args, uintmax_t);
+#endif
else
value = (long)va_arg (args, unsigned int);
if (fmtint(buffer, &currlen, maxlen, value,
@@ -382,8 +386,10 @@ dopr(char *buffer, size_t maxlen, const char *format, va_list args_in)
value = (LLONG)va_arg (args, unsigned LLONG);
else if (cflags == DP_C_SIZE)
value = va_arg (args, size_t);
+#ifdef notyet
else if (cflags == DP_C_INTMAX)
value = va_arg (args, uintmax_t);
+#endif
else
value = (long)va_arg (args, unsigned int);
if (fmtint(buffer, &currlen, maxlen, value,