FIX: some compiler problems caused by PM3 master commit https://github.com/Proxmark...

[proxmark3-svn] / armsrc / printf.c

diff --git a/armsrc/printf.c b/armsrc/printf.c
index 6060870dc3587cb5b2a6faf9ee8c98128229a991..eca676a201e0038cbfaddf33f2e0db586607daf6 100644 (file)
--- a/armsrc/printf.c
+++ b/armsrc/printf.c
@@ -33,41 +33,25 @@
  *
  *     @(#)subr_prf.c  8.3 (Berkeley) 1/21/94
  */
+#include "printf.h"
 
-typedef unsigned long size_t;
-typedef long ssize_t;
-#ifdef __64BIT__
-typedef unsigned long long uintmax_t;
-typedef long long intmax_t;
-#else
-typedef unsigned int uintmax_t;
-typedef int intmax_t;
-#endif
 typedef unsigned char u_char;
 typedef unsigned int u_int;
-typedef unsigned long u_long;
-typedef unsigned short u_short;
 typedef unsigned long long u_quad_t;
 typedef long long quad_t;
-typedef unsigned long uintptr_t;
-typedef long ptrdiff_t;
-#define NULL ((void*)0)
+typedef unsigned long u_long;
+typedef unsigned short u_short;
+typedef int ssize_t;
+/*
+typedef uint32_t uintmax_t;
+typedef int32_t intmax_t;
+*/
+
 #define NBBY    8               /* number of bits in a byte */
+
 char const hex2ascii_data[] = "0123456789abcdefghijklmnopqrstuvwxyz";
 #define hex2ascii(hex)  (hex2ascii_data[hex])
-#define va_list __builtin_va_list
-#define va_start __builtin_va_start
-#define va_arg __builtin_va_arg
-#define va_end __builtin_va_end
 #define toupper(c)      ((c) - 0x20 * (((c) >= 'a') && ((c) <= 'z')))
-static size_t
-strlen(const char *s)
-{
-       size_t l = 0;
-       while (*s++)
-               l++;
-       return l;
-}
 
 /* Max number conversion buffer length: a u_quad_t in base 2, plus NUL byte. */
 #define MAXNBUF        (sizeof(intmax_t) * NBBY + 1)
@@ -431,13 +415,17 @@ number:
 #undef PCHAR
 }
 
+int vsprintf(char *dest, const char *fmt, va_list ap)
+{
+       return kvsprintf(fmt, dest, 10, ap);
+}
+
 int
 sprintf(char *dest, const char *fmt, ...)
 {
        /* http://www.pagetable.com/?p=298 */
        int retval;
        va_list ap;
-
        va_start(ap, fmt);
        retval = kvsprintf(fmt, dest, 10, ap);
        va_end(ap);