From 22950ba3df3a0b739786243679d69cd4094e8b20 Mon Sep 17 00:00:00 2001
From: Robert de Bath <rdebath@poboxes.com>
Date: Sat, 20 Sep 2003 19:44:36 +0200
Subject: Import Dev86src-0.16.13.tar.gz

---
 libc/Makefile        | 4 ++++
 libc/misc/strtol.c   | 6 +++---
 libc/string/string.c | 5 +++--
 3 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'libc')

diff --git a/libc/Makefile b/libc/Makefile
index 7d1ceb9..a9a5460 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -15,6 +15,10 @@ DEFS=-D__LIBC__
 
 include Make.defs
 
+ifeq ($(VERSION),)
+include VERSION
+endif
+
 CFLAGS=$(ARCH) $(CCFLAGS) $(DEFS)
 
 ############################################################################
diff --git a/libc/misc/strtol.c b/libc/misc/strtol.c
index d8d62ea..25ea0ea 100644
--- a/libc/misc/strtol.c
+++ b/libc/misc/strtol.c
@@ -66,8 +66,8 @@ strtoul(const char *nptr, char **endptr, int base)
 
   /* If base==0 and the string begins with "0x" then we're supposed
      to assume that it's hexadecimal (base 16). */
-  else
-    if (base==0 && *nptr=='0')
+  if (base==0 && *nptr=='0')
+    {
       if (toupper(*(nptr+1))=='X')
 	{
 	  base=16;
@@ -80,7 +80,7 @@ strtoul(const char *nptr, char **endptr, int base)
 	  base=8;
 	  nptr++;
 	}
-    
+    }
 
   /* If base is still 0 (it was 0 to begin with and the string didn't begin
      with "0"), then we are supposed to assume that it's base 10 */
diff --git a/libc/string/string.c b/libc/string/string.c
index d672e77..3c14e56 100644
--- a/libc/string/string.c
+++ b/libc/string/string.c
@@ -42,10 +42,11 @@ const char * str;
 
 #ifdef PARANOID
   push	es
-  push	ds	; Im not sure if this is needed, so just in case.
+  push	ds	! Im not sure if this is needed, so just in case.
   pop	es
   cld
-#endif		! This is almost the same as memchr, but it can
+#endif
+		! This is almost the same as memchr, but it can
 		! stay as a special.
 
 #if __FIRST_ARG_IN_AX__
-- 
cgit v1.2.1