diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-02-11 10:08:32 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-02-11 10:08:32 -0800 |
| commit | 279dba5bed1706ddce0164f78c32a81389b85909 (patch) | |
| tree | a9da14720b515f355eddb47fb2df30966745e5ef | |
| parent | 52578f77a14808b7d8925b3ee309d5ceac674b22 (diff) | |
unifdef hpux
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | chooser/chooser.c | 10 | ||||
| -rw-r--r-- | xdm/auth.c | 24 | ||||
| -rw-r--r-- | xdm/netaddr.c | 2 |
3 files changed, 1 insertions, 35 deletions
diff --git a/chooser/chooser.c b/chooser/chooser.c index e39b432..b4fde8c 100644 --- a/chooser/chooser.c +++ b/chooser/chooser.c @@ -104,15 +104,7 @@ in this Software without prior written authorization from The Open Group. # define ishexdigit(c) (isdigit(c) || ('a' <= (c) && (c) <= 'f')) #endif -#ifdef hpux -# include <sys/utsname.h> -# ifdef HAS_IFREQ -# include <net/if.h> -# endif -#else -# include <net/if.h> -#endif /* hpux */ - +#include <net/if.h> #include <netdb.h> #include <X11/keysym.h> @@ -52,9 +52,6 @@ from The Open Group. # include "dm_socket.h" #endif -#if defined(hpux) -# include <sys/utsname.h> -#endif #if defined(SYSV) && defined(i386) # include <sys/stream.h> @@ -773,27 +770,6 @@ DefineLocal (FILE *file, Xauth *auth) * and so, you may be better off using gethostname (if it exists). */ -#if defined(hpux) - /* - * For HP-UX, HP's Xlib expects a fully-qualified domain name, which - * is achieved by using gethostname(). For compatibility, we must - * also still create the entry using uname(). - */ - char tmp_displayname[100]; - struct utsname name; - - tmp_displayname[0] = 0; - uname(&name); - snprintf(tmp_displayname, sizeof(tmp_displayname), "%s", name.nodename); - writeAddr (FamilyLocal, strlen (tmp_displayname), tmp_displayname, - file, auth); - - /* - * If _XGetHostname() returned the same value as uname(), don't - * write a duplicate entry. - */ - if (strcmp (displayname, tmp_displayname)) -#endif writeAddr (FamilyLocal, len, displayname, file, auth); } diff --git a/xdm/netaddr.c b/xdm/netaddr.c index ba23148..aa60a5f 100644 --- a/xdm/netaddr.c +++ b/xdm/netaddr.c @@ -139,11 +139,9 @@ int ConvertAddr (XdmcpNetaddr saddr, int *len, char **addr) break; # endif # ifdef AF_UNIX -# ifndef hpux case AF_UNIX: retval = FamilyLocal; break; -# endif # endif # ifdef TCPCONN case AF_INET: |