[Winbash-checkins] CVS: winbash/builtins Makefile,1.2,1.3 bind.def,1.3,1.4 echo.def,1.2,1.3 enable.def,1.2,1.3 fc.def,1.2,1.3 hash.def,1.2,1.3 help.def,1.2,1.3 history.def,1.2,1.3 setattr.def,1.3,1.4 type.def,1.2,1.3 ulimit.def,1.3,1.4 umask.def,1.2,1.3

[Enrico B. <enr...@us...>]

Update of /cvsroot/winbash/winbash/builtins
In directory usw-pr-cvs1:/tmp/cvs-serv26197/builtins

Modified Files:
	Makefile bind.def echo.def enable.def fc.def hash.def help.def 
	history.def setattr.def type.def ulimit.def umask.def 
Log Message:
re-added inclusion of nt_types in builtins

Index: Makefile
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	9 Mar 2002 04:17:14 -0000	1.2
+++ Makefile	10 Mar 2002 15:54:10 -0000	1.3
@@ -25,40 +25,37 @@
 CPPFLAGS += -D_DEBUG 
 endif
 
-srcdir = .
-VPATH = .:$(srcdir)
-
 .SUFFIXES:
 .SUFFIXES: .def .c .obj
 # How to make a .obj file from a .def file.
 .def.obj:
 	$(RM) $@
-	./$(MKBUILTINS) $(DIRECTDEFINE) $<
+	./$(MKBUILTINS) -D '' $(DIRECTDEFINE) $<
 	$(CC) -c $(CPPFLAGS) $(CPPDEFS) $(CFLAGS) $*.c
 #	$(RM) $*.c
 
 # How to make a .c file from a .def file.
 .def.c:
 	$(RM) $@
-	./$(MKBUILTINS) $(DIRECTDEFINE) $<
+	./$(MKBUILTINS) -D '' $(DIRECTDEFINE) $<
 
 .c.obj:
 	$(RM) $@
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
 
-DEFS =  $(srcdir)/alias.def $(srcdir)/bind.def $(srcdir)/break.def \
-	$(srcdir)/builtin.def $(srcdir)/cd.def $(srcdir)/colon.def \
-	$(srcdir)/command.def $(srcdir)/declare.def $(srcdir)/echo.def \
-	$(srcdir)/enable.def $(srcdir)/eval.def $(srcdir)/getopts.def \
-	$(srcdir)/exec.def $(srcdir)/exit.def $(srcdir)/fc.def \
-	$(srcdir)/fg_bg.def $(srcdir)/hash.def $(srcdir)/help.def \
-	$(srcdir)/history.def $(srcdir)/jobs.def $(srcdir)/kill.def \
-	$(srcdir)/let.def $(srcdir)/read.def $(srcdir)/return.def \
-	$(srcdir)/set.def $(srcdir)/setattr.def $(srcdir)/shift.def \
-	$(srcdir)/source.def $(srcdir)/suspend.def $(srcdir)/test.def \
-	$(srcdir)/times.def $(srcdir)/trap.def $(srcdir)/type.def \
-	$(srcdir)/ulimit.def $(srcdir)/umask.def $(srcdir)/wait.def \
-	$(srcdir)/inlib.def
+DEFS =  alias.def bind.def break.def \
+	builtin.def cd.def colon.def \
+	command.def declare.def echo.def \
+	enable.def eval.def getopts.def \
+	exec.def exit.def fc.def \
+	fg_bg.def hash.def help.def \
+	history.def jobs.def kill.def \
+	let.def read.def return.def \
+	set.def setattr.def shift.def \
+	source.def suspend.def test.def \
+	times.def trap.def type.def \
+	ulimit.def umask.def wait.def \
+	inlib.def
 
 STATIC_SOURCE = common.c getopt.c bashgetopt.c getopt.h 
 
@@ -77,8 +74,8 @@
 	./$(MKBUILTINS) -externfile builtext.h -structfile builtins.c \
 	-noproduction $(DIRECTDEFINE) $(DEFS)
 
-$(MKBUILTINS): $(srcdir)/mkbuiltins.c ../config.h
-	$(CC) $(CPPFLAGS) $(CPPDEFS) $(CFLAGS) -o $(MKBUILTINS) $(srcdir)/mkbuiltins.c
+$(MKBUILTINS): mkbuiltins.c ../config.h
+	$(CC) $(CPPFLAGS) $(CPPDEFS) $(CFLAGS) -o $(MKBUILTINS) mkbuiltins.c
 
 ulimit.obj: ulimit.def pipesize.h
 

Index: bind.def
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/bind.def,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bind.def	9 Mar 2002 16:05:42 -0000	1.3
+++ bind.def	10 Mar 2002 15:54:11 -0000	1.4
@@ -52,6 +52,10 @@
 #include <readline/history.h>
 #include "bashgetopt.h"
 
+#if defined (__NT_VC__)
+#include "../nt_types.h"
+#endif
+
 static int query_bindings ();
 
 extern int bash_readline_initialized;

Index: echo.def
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/echo.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- echo.def	9 Mar 2002 04:20:36 -0000	1.2
+++ echo.def	10 Mar 2002 15:54:11 -0000	1.3
@@ -58,6 +58,10 @@
 #  define VALID_ECHO_OPTIONS "n"
 #endif /* !V9_ECHO */
 
+#if defined (__NT_VC__)
+#include "../nt_types.h"
+#endif
+
 /* Print the words in LIST to standard output.  If the first word is
    `-n', then don't print a trailing newline.  We also support the
    echo syntax from Version 9 unix systems. */

Index: enable.def
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/enable.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- enable.def	9 Mar 2002 04:20:36 -0000	1.2
+++ enable.def	10 Mar 2002 15:54:11 -0000	1.3
@@ -35,6 +35,10 @@
 #include "../builtins.h"
 #include "common.h"
 
+#if defined (__NT_VC__)
+#include "../nt_types.h"
+#endif
+
 #define ENABLED  1
 #define DISABLED 2
 

Index: fc.def
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/fc.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fc.def	9 Mar 2002 04:20:36 -0000	1.2
+++ fc.def	10 Mar 2002 15:54:11 -0000	1.3
@@ -62,6 +62,10 @@
 #include <readline/history.h>
 #include "bashgetopt.h"
 
+#if defined (__NT_VC__)
+#include "../nt_types.h"
+#endif
+
 /* Not all systems declare ERRNO in errno.h... and some systems #define it! */
 #if !defined (errno)
 extern int errno;

Index: hash.def
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/hash.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hash.def	9 Mar 2002 04:20:36 -0000	1.2
+++ hash.def	10 Mar 2002 15:54:11 -0000	1.3
@@ -48,6 +48,10 @@
 #include "common.h"
 #include "../execute_cmd.h"
 
+#if defined (__NT_VC__)
+#include "../nt_types.h"
+#endif
+
 extern int dot_found_in_search;
 
 void

Index: help.def
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/help.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- help.def	9 Mar 2002 04:20:36 -0000	1.2
+++ help.def	10 Mar 2002 15:54:11 -0000	1.3
@@ -39,6 +39,10 @@
 #  define FNM_NOMATCH 1
 #endif /* USE_GLOB_LIBRARY */
 
+#if defined (__NT_VC__)
+#include "../nt_types.h"
+#endif
+
 /* Print out a list of the known functions in the shell, and what they do.
    If LIST is supplied, print out the list which matches for each pattern
    specified. */

Index: history.def
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/history.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- history.def	9 Mar 2002 04:20:36 -0000	1.2
+++ history.def	10 Mar 2002 15:54:11 -0000	1.3
@@ -44,6 +44,10 @@
 #include "../bashhist.h"
 #include <readline/history.h>
 
+#if defined (__NT_VC__)
+#include "../nt_types.h"
+#endif
+
 /* History.  Arg of -w FILENAME means write file, arg of -r FILENAME
    means read file.  Arg of N means only display that many items. */
 

Index: setattr.def
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/setattr.def,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- setattr.def	9 Mar 2002 16:05:42 -0000	1.3
+++ setattr.def	10 Mar 2002 15:54:11 -0000	1.4
@@ -25,6 +25,10 @@
 #include "common.h"
 #include "bashgetopt.h"
 
+#if defined (__NT_VC__)
+#include "../nt_types.h"
+#endif
+
 extern int array_needs_making;
 extern char *this_command_name;
 

Index: type.def
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/type.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- type.def	9 Mar 2002 04:20:36 -0000	1.2
+++ type.def	10 Mar 2002 15:54:11 -0000	1.3
@@ -52,6 +52,10 @@
 
 #include "common.h"
 
+#if defined (__NT_VC__)
+#include "../nt_types.h"
+#endif
+
 extern STRING_INT_ALIST word_token_alist[];
 
 /* For each word in LIST, find out what the shell is going to do with

Index: ulimit.def
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/ulimit.def,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ulimit.def	9 Mar 2002 16:05:42 -0000	1.3
+++ ulimit.def	10 Mar 2002 15:54:11 -0000	1.4
@@ -73,6 +73,10 @@
 #  include <limits.h>
 #endif
 
+#if defined (__NT_VC__)
+#include "../nt_types.h"
+#endif
+
 /* Check for the most basic symbols.  If they aren't present, this
    system's <sys/resource.h> isn't very useful to us. */
 #if !defined (RLIMIT_FSIZE) || defined (GETRLIMIT_MISSING)

Index: umask.def
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/umask.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- umask.def	9 Mar 2002 04:20:36 -0000	1.2
+++ umask.def	10 Mar 2002 15:54:11 -0000	1.3
@@ -38,6 +38,10 @@
 #include "../posixstat.h"
 #include "common.h"
 
+#if defined (__NT_VC__)
+#include "../nt_types.h"
+#endif
+
 /* **************************************************************** */
 /*                                                                  */
 /*                     UMASK Builtin and Helpers                    */