[uClibc-cvs] uClibc/libc/stdio scanf.c,1.30,1.31

Manuel Novoa III mjn3 at uclibc.org
Sat Sep 13 16:09:45 UTC 2003


Update of /var/cvs/uClibc/libc/stdio
In directory winder:/tmp/cvs-serv3458

Modified Files:
	scanf.c 
Log Message:
Fix a problem reported by Atsushi Nemoto <anemo at mba.ocn.ne.jp>
for environments where long and long long are the same size.


Index: scanf.c
===================================================================
RCS file: /var/cvs/uClibc/libc/stdio/scanf.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- scanf.c	6 Sep 2003 03:37:17 -0000	1.30
+++ scanf.c	13 Sep 2003 16:09:42 -0000	1.31
@@ -29,6 +29,10 @@
  * Sep 5, 2003
  * Bug fix: store flag wasn't respected if no positional args.
  * Implement vs{n}scanf for the non-buffered stdio no-wchar case.
+ *
+ * Sep 13, 2003
+ * Bug fix: Fix a problem reported by Atsushi Nemoto <anemo at mba.ocn.ne.jp>
+ * for environments where long and long long are the same.
  */
 
 
@@ -92,7 +96,7 @@
 
 extern void _store_inttype(void *dest, int desttype, uintmax_t val);
 
-#ifdef LLONG_MAX
+#if defined(ULLONG_MAX) && (LLONG_MAX > LONG_MAX)
 
 extern unsigned long long
 _stdlib_strto_ll(register const char * __restrict str,
@@ -101,7 +105,7 @@
 #define STRTOUIM(s,e,b,sf) _stdlib_strto_ll(s,e,b,sf)
 #endif
 
-#else  /* LLONG_MAX */
+#else  /* defined(ULLONG_MAX) && (LLONG_MAX > LONG_MAX) */
 
 extern unsigned long
 _stdlib_strto_l(register const char * __restrict str,
@@ -111,7 +115,7 @@
 #define STRTOUIM(s,e,b,sf) _stdlib_strto_l(s,e,b,sf)
 #endif
 
-#endif /* LLONG_MAX */
+#endif /* defined(ULLONG_MAX) && (LLONG_MAX > LONG_MAX) */
 
 #ifndef STRTOUIM
 #error STRTOUIM conversion function is undefined!




More information about the uClibc-cvs mailing list