(C_SWITCH_SYSTEM): Revert last change (fixed by

regexp.h change).
(TERMINFO, LIBS_TERMCAP): Define.

src/s/osf5-0.h

@@ -3,16 +3,8 @@
 
 /* It's enough to define _OSF_SOURCE instead of _BSD.  */
 
-/* -nointrinsics is required to avoid losing with definitions of POSIX
-   stuff in regex.c, for instance, where regex_t isn't consistent
-   with the system defintion.  This may be necessary also on OSF 4
-   systems with dtk 6.4 installed.  */
 #undef C_SWITCH_SYSTEM
-#ifdef __GNUC__
 #define C_SWITCH_SYSTEM	-D_OSF_SOURCE
-#else
-#define C_SWITCH_SYSTEM	-D_OSF_SOURCE -nointrinsics
-#endif
 
 #define WAIT_USE_INT
 #define SYS_SIGLIST_DECLARED
@@ -25,3 +17,6 @@
 #define INHIBIT_X11R6_XIM
 
 #define USE_MMAP_FOR_BUFFERS	1
+
+#define TERMINFO
+#define LIBS_TERMCAP -lcurses