misc cleanup

[unix-history] / usr / src / bin / sh / shell.h

diff --git a/usr/src/bin/sh/shell.h b/usr/src/bin/sh/shell.h
index 595287b..41c698b 100644 (file)
--- a/usr/src/bin/sh/shell.h
+++ b/usr/src/bin/sh/shell.h
@@ -1,25 +1,24 @@
 /*-
 /*-

- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1991, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * Kenneth Almquist.
  *
  * %sccs.include.redist.c%
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Kenneth Almquist.
  *
  * %sccs.include.redist.c%
  *

- *     @(#)shell.h     5.2 (Berkeley) %G%
+ *     @(#)shell.h     8.2 (Berkeley) %G%

  */
 
 /*
  * The follow should be set to reflect the type of system you have:
  *     JOBS -> 1 if you have Berkeley job control, 0 otherwise.
  *     SYMLINKS -> 1 if your system includes symbolic links, 0 otherwise.
  */
 
 /*
  * The follow should be set to reflect the type of system you have:
  *     JOBS -> 1 if you have Berkeley job control, 0 otherwise.
  *     SYMLINKS -> 1 if your system includes symbolic links, 0 otherwise.

- *     DIRENT -> 1 if your system has the SVR3 directory(3X) routines.
- *     UDIR -> 1 if you want the shell to simulate the /u directory.

  *     SHORTNAMES -> 1 if your linker cannot handle long names.
  *     define BSD if you are running 4.2 BSD or later.
  *     define SYSV if you are running under System V.
  *     SHORTNAMES -> 1 if your linker cannot handle long names.
  *     define BSD if you are running 4.2 BSD or later.
  *     define SYSV if you are running under System V.

- *     define DEBUG to turn on debugging.
+ *     define DEBUG=1 to compile in debugging (set global "debug" to turn on)
+ *     define DEBUG=2 to compile in and turn on debugging.

  *
  * When debugging is on, debugging info will be written to $HOME/trace and
  * a quit signal will generate a core dump.
  *
  * When debugging is on, debugging info will be written to $HOME/trace and
  * a quit signal will generate a core dump.


@@ -28,13 +27,10 @@
 
 #define JOBS 1
 #define SYMLINKS 1
 
 #define JOBS 1
 #define SYMLINKS 1

-#define DIRENT 1
-#define UDIR 0
-#define ATTY 0
-#define SHORTNAMES 0
-#define BSD
-/* #define SYSV */
-/* #define DEBUG */
+#ifndef BSD
+#define BSD 1
+#endif
+#define DEBUG 1

 
 #ifdef __STDC__
 typedef void *pointer;
 
 #ifdef __STDC__
 typedef void *pointer;


@@ -46,10 +42,12 @@ typedef char *pointer;
 #ifndef NULL
 #define NULL 0
 #endif
 #ifndef NULL
 #define NULL 0
 #endif

-#endif /* __STDC__ */
+#endif /*  not __STDC__ */

 #define STATIC /* empty */
 #define MKINIT /* empty */
 
 #define STATIC /* empty */
 #define MKINIT /* empty */
 

+#include <sys/cdefs.h>
+

 extern char nullstr[1];                /* null string */
 
 
 extern char nullstr[1];                /* null string */