* libc/include/ctype.h: Remove isblank macro.

	* libc/ctype/Makefile.am (LIB_SOURCES): Add isblank.c.
	* libc/ctype/isblank.c: New file.
	* libc/include/ctype.h [!__STRICT_ANSI__]: Add isblank
	declaration.  Add isblank macro.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 154da62..c63ec3c 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,12 @@
+2002-06-18  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+       * libc/include/ctype.h: Remove isblank macro.
+
+       * libc/ctype/Makefile.am (LIB_SOURCES): Add isblank.c.
+       * libc/ctype/isblank.c: New file.
+       * libc/include/ctype.h [!__STRICT_ANSI__]: Add isblank
+       declaration.  Add isblank macro.
+
 2002-06-18  Jeff Johnston  <jjohnstn@redhat.com>
 
         * testsuite/newlib.stdlib/atexit.c: New file.

diff --git a/newlib/libc/ctype/Makefile.am b/newlib/libc/ctype/Makefile.am
index 477a14d..216950c 100644 (file)
--- a/newlib/libc/ctype/Makefile.am
+++ b/newlib/libc/ctype/Makefile.am
@@ -9,6 +9,7 @@ LIB_SOURCES = \
        isalnum.c \
        isalpha.c \
        isascii.c \
+       isblank.c \
        iscntrl.c \
        isdigit.c \
        islower.c \

diff --git a/newlib/libc/ctype/Makefile.in b/newlib/libc/ctype/Makefile.in
index 3d94692..05d8810 100644 (file)
--- a/newlib/libc/ctype/Makefile.in
+++ b/newlib/libc/ctype/Makefile.in
@@ -113,6 +113,7 @@ LIB_SOURCES = \
        isalnum.c \
        isalpha.c \
        isascii.c \
+       isblank.c \
        iscntrl.c \
        isdigit.c \
        islower.c \
@@ -172,21 +173,21 @@ LIBS = @LIBS@
 lib_a_LIBADD = 
 @USE_LIBTOOL_FALSE@lib_a_OBJECTS =  ctype_.$(OBJEXT) isalnum.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@isalpha.$(OBJEXT) isascii.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@iscntrl.$(OBJEXT) isdigit.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@islower.$(OBJEXT) isupper.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@isprint.$(OBJEXT) ispunct.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@isspace.$(OBJEXT) isxdigit.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@toascii.$(OBJEXT) tolower.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@toupper.$(OBJEXT) _tolower.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@_toupper.$(OBJEXT)
+@USE_LIBTOOL_FALSE@isblank.$(OBJEXT) iscntrl.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@isdigit.$(OBJEXT) islower.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@isupper.$(OBJEXT) isprint.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@ispunct.$(OBJEXT) isspace.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@isxdigit.$(OBJEXT) toascii.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@tolower.$(OBJEXT) toupper.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@_tolower.$(OBJEXT) _toupper.$(OBJEXT)
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
 libctype_la_LIBADD = 
 @USE_LIBTOOL_TRUE@libctype_la_OBJECTS =  ctype_.lo isalnum.lo isalpha.lo \
-@USE_LIBTOOL_TRUE@isascii.lo iscntrl.lo isdigit.lo islower.lo \
-@USE_LIBTOOL_TRUE@isupper.lo isprint.lo ispunct.lo isspace.lo \
-@USE_LIBTOOL_TRUE@isxdigit.lo toascii.lo tolower.lo toupper.lo \
-@USE_LIBTOOL_TRUE@_tolower.lo _toupper.lo
+@USE_LIBTOOL_TRUE@isascii.lo isblank.lo iscntrl.lo isdigit.lo \
+@USE_LIBTOOL_TRUE@islower.lo isupper.lo isprint.lo ispunct.lo \
+@USE_LIBTOOL_TRUE@isspace.lo isxdigit.lo toascii.lo tolower.lo \
+@USE_LIBTOOL_TRUE@toupper.lo _tolower.lo _toupper.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

diff --git a/newlib/libc/ctype/isblank.c b/newlib/libc/ctype/isblank.c
new file mode 100644 (file)
index 0000000..c75d8ab
--- /dev/null
+++ b/newlib/libc/ctype/isblank.c
@@ -0,0 +1,40 @@
+
+/*
+FUNCTION
+       <<isblank>>---blank character predicate
+
+INDEX
+       isblank
+
+ANSI_SYNOPSIS
+       #include <ctype.h>
+       int isblank(int <[c]>);
+
+TRAD_SYNOPSIS
+       #include <ctype.h>
+       int isblank(<[c]>);
+
+DESCRIPTION
+<<isblank>> is a macro which classifies ASCII integer values by table
+lookup.  It is a predicate returning non-zero for blank characters, and 0 
+for other characters.
+
+You can use a compiled subroutine instead of the macro definition by
+undefining the macro using `<<#undef isblank>>'.
+
+RETURNS
+<<isblank>> returns non-zero if <[c]> is a blank character.
+
+*/
+
+#include <_ansi.h>
+#include <ctype.h>
+
+
+
+#undef isblank
+int
+_DEFUN(isblank,(c),int c)
+{
+       return (c == ' ' || c == '\t');
+}

diff --git a/newlib/libc/include/ctype.h b/newlib/libc/include/ctype.h
index 18dd02f..194a52b 100644 (file)
--- a/newlib/libc/include/ctype.h
+++ b/newlib/libc/include/ctype.h
@@ -21,6 +21,7 @@ int _EXFUN(tolower, (int __c));
 int _EXFUN(toupper, (int __c));
 
 #ifndef __STRICT_ANSI__
+int _EXFUN(isblank, (int __c));
 int _EXFUN(isascii, (int __c));
 int _EXFUN(toascii, (int __c));
 int _EXFUN(_tolower, (int __c));

diff --git a/newlib/libc/sys/linux/sys/cdefs.h b/newlib/libc/sys/linux/sys/cdefs.h
index a9759a7..f0b6a27 100644 (file)
--- a/newlib/libc/sys/linux/sys/cdefs.h
+++ b/newlib/libc/sys/linux/sys/cdefs.h
@@ -44,6 +44,7 @@
 #ifndef _SYS_CDEFS_H
 #define _SYS_CDEFS_H
 
+#define __FBSDID(x) /* nothing */
 /*
  * Note: the goal here is not compatibility to K&R C. Since we know that we
  * have GCC which understands ANSI C perfectly well, we make use of this.