unifdef -UUSG

USG was defined for a handful of pre-SVR4 systems based on
AT&T's Unix System Group releases in the old imake configs
and has never been defined in X11R7 modular builds.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

2 files changed, 0 insertions, 11 deletions

diff --git a/choose.c b/choose.c
index a161e28..4bf434f 100644
--- a/choose.c
+++ b/choose.c
@@ -42,16 +42,12 @@ in this Software without prior written authorization from The Open Group.
 #ifdef SYSV
 #include <dirent.h>
 #else
-#ifdef USG
-#include <dirent.h>
-#else
 #include <sys/dir.h>
 #ifndef dirent
 #define dirent direct
 #endif
 #endif
 #endif
-#endif
 
 static Pixel save_message_foreground;
 static Pixel save_message_background;
diff --git a/signals.c b/signals.c
index 55600c6..d029f3e 100644
--- a/signals.c
+++ b/signals.c
@@ -36,12 +36,6 @@ in this Software without prior written authorization from The Open Group.
 #include "save.h"
 
 #include <errno.h>
-#ifdef USG
-#ifndef __TYPES__
-#include <sys/types.h>			/* forgot to protect it... */
-#define __TYPES__
-#endif /* __TYPES__ */
-#else
 #if defined(_POSIX_SOURCE) && defined(MOTOROLA)
 #undef _POSIX_SOURCE
 #include <sys/types.h>
@@ -49,7 +43,6 @@ in this Software without prior written authorization from The Open Group.
 #else
 #include <sys/types.h>
 #endif
-#endif /* USG */
 
 #ifdef X_POSIX_C_SOURCE
 #define _POSIX_C_SOURCE X_POSIX_C_SOURCE