make #ifndef WINDOW apply to whole file

SCCS-vsn: lib/libcurses/curses.h 1.3

diff --git a/usr/src/lib/libcurses/curses.h b/usr/src/lib/libcurses/curses.h
index 4d48224..47d6e36 100644 (file)
--- a/usr/src/lib/libcurses/curses.h
+++ b/usr/src/lib/libcurses/curses.h
@@ -1,4 +1,5 @@
-/* %G% (Berkeley) @(#)curses.h 1.2 */
+/* %G% (Berkeley) @(#)curses.h 1.3 */
+# ifndef WINDOW

 
 # include      <stdio.h>
  
 
 # include      <stdio.h>
  


@@ -24,8 +25,6 @@
 
 typedef        struct sgttyb   SGTTY;
 
 
 typedef        struct sgttyb   SGTTY;
 

-# ifndef WINDOW
-

 /*
  * Capabilities from termcap
  */
 /*
  * Capabilities from termcap
  */


@@ -79,8 +78,6 @@ int   __void__;
 # define       VOID(x) (x)
 # endif
 
 # define       VOID(x) (x)
 # endif
 

-# endif
-

 /*
  * psuedo functions for standard screen
  */
 /*
  * psuedo functions for standard screen
  */


@@ -138,3 +135,5 @@ int __void__;
 
 WINDOW *initscr(), *newwin(), *subwin();
 char   *longname();
 
 WINDOW *initscr(), *newwin(), *subwin();
 char   *longname();

+
+# endif