From 3d0e1a5cc861f46ca3b9fe90146735594caf8e77 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Tue, 20 Feb 2007 14:15:18 +0000 Subject: [PATCH] *** empty log message *** --- ase/test/awk/awk.c | 12 ++++---- ase/test/awk/makefile.msw.bcc | 4 +-- ase/utl/ctype.h | 52 +++++++++++++++++------------------ ase/utl/main.c | 4 +-- ase/utl/makefile.msw.bcc | 2 +- ase/utl/stdio.c | 6 ++-- 6 files changed, 40 insertions(+), 40 deletions(-) diff --git a/ase/test/awk/awk.c b/ase/test/awk/awk.c index d3d4a038..4e434d4f 100644 --- a/ase/test/awk/awk.c +++ b/ase/test/awk/awk.c @@ -1,11 +1,15 @@ /* - * $Id: awk.c,v 1.168 2007-02-20 14:09:44 bacon Exp $ + * $Id: awk.c,v 1.169 2007-02-20 14:15:18 bacon Exp $ */ #include #include #include -#include + +#include +#include +#include + #include #include #include @@ -28,10 +32,6 @@ #include #endif -#include "../../etc/printf.c" -#include "../../etc/main.c" -#include "../../etc/ctype.h" - #if defined(_WIN32) && defined(_MSC_VER) && defined(_DEBUG) #define _CRTDBG_MAP_ALLOC #include diff --git a/ase/test/awk/makefile.msw.bcc b/ase/test/awk/makefile.msw.bcc index d1deb6bf..19511f74 100644 --- a/ase/test/awk/makefile.msw.bcc +++ b/ase/test/awk/makefile.msw.bcc @@ -10,8 +10,8 @@ CC = bcc32 LD = ilink32 CFLAGS = -O2 -WM -WU -RT- -w -I..\..\.. -LDFLAGS = -ap -Tpe -Gn -c -L..\..\awk -LIBS = import32.lib cw32mt.lib aseawk.lib +LDFLAGS = -ap -Tpe -Gn -c -L..\..\awk -L..\..\utl +LIBS = import32.lib cw32mt.lib aseawk.lib aseutl.lib STARTUP = c0x32w.obj all: aseawk diff --git a/ase/utl/ctype.h b/ase/utl/ctype.h index 9001859a..c24a4320 100644 --- a/ase/utl/ctype.h +++ b/ase/utl/ctype.h @@ -11,37 +11,37 @@ #if defined(ASE_CHAR_IS_MCHAR) #include - #define ase_isupper(x) isupper(x) - #define ase_islower(x) islower(x) - #define ase_isalpha(x) isalpha(x) - #define ase_isdigit(x) isdigit(x) - #define ase_isxdigit(x) isxdigit(x) - #define ase_isalnum(x) isalnum(x) - #define ase_isspace(x) isspace(x) - #define ase_isprint(x) isprint(x) - #define ase_isgraph(x) isgraph(x) - #define ase_iscntrl(x) iscntrl(x) - #define ase_ispunct(x) ispunct(x) + #define ase_isupper isupper + #define ase_islower islower + #define ase_isalpha isalpha + #define ase_isdigit isdigit + #define ase_isxdigit isxdigit + #define ase_isalnum isalnum + #define ase_isspace isspace + #define ase_isprint isprint + #define ase_isgraph isgraph + #define ase_iscntrl iscntrl + #define ase_ispunct ispunct - #define ase_toupper(x) tolower(x) - #define ase_tolower(x) tolower(x) + #define ase_toupper tolower + #define ase_tolower tolower #else #include - #define ase_isupper(x) iswupper(x) - #define ase_islower(x) iswlower(x) - #define ase_isalpha(x) iswalpha(x) - #define ase_isdigit(x) iswdigit(x) - #define ase_isxdigit(x) iswxdigit(x) - #define ase_isalnum(x) iswalnum(x) - #define ase_isspace(x) iswspace(x) - #define ase_isprint(x) iswprint(x) - #define ase_isgraph(x) iswgraph(x) - #define ase_iscntrl(x) iswcntrl(x) - #define ase_ispunct(x) iswpunct(x) + #define ase_isupper iswupper + #define ase_islower iswlower + #define ase_isalpha iswalpha + #define ase_isdigit iswdigit + #define ase_isxdigit iswxdigit + #define ase_isalnum iswalnum + #define ase_isspace iswspace + #define ase_isprint iswprint + #define ase_isgraph iswgraph + #define ase_iscntrl iswcntrl + #define ase_ispunct iswpunct - #define ase_toupper(x) towlower(x) - #define ase_tolower(x) towlower(x) + #define ase_toupper towlower + #define ase_tolower towlower #endif #endif diff --git a/ase/utl/main.c b/ase/utl/main.c index ba2dd2f1..3f051970 100644 --- a/ase/utl/main.c +++ b/ase/utl/main.c @@ -1,10 +1,10 @@ /* - * $Id: main.c,v 1.10 2007-02-20 14:04:21 bacon Exp $ + * $Id: main.c,v 1.11 2007-02-20 14:15:18 bacon Exp $ * * {License} */ -#include +#include #include #include #include diff --git a/ase/utl/makefile.msw.bcc b/ase/utl/makefile.msw.bcc index 8d6a5c5b..5727ba7a 100644 --- a/ase/utl/makefile.msw.bcc +++ b/ase/utl/makefile.msw.bcc @@ -1,4 +1,4 @@ -OUT = aseetc +OUT = aseutl C_SRCS = main.c stdio.c C_OBJS = $(C_SRCS:.c=.obj) diff --git a/ase/utl/stdio.c b/ase/utl/stdio.c index 5c6439fd..606fee28 100644 --- a/ase/utl/stdio.c +++ b/ase/utl/stdio.c @@ -1,11 +1,11 @@ /* - * $Id: stdio.c,v 1.1 2007-02-20 14:04:22 bacon Exp $ + * $Id: stdio.c,v 1.2 2007-02-20 14:15:18 bacon Exp $ * * {License} */ -#include -#include +#include +#include #include #include