diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-15 20:59:35 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-02-08 22:40:46 +0100 |
| commit | 184c5d778210dea8eab045a5f7ecf9d4344c1c34 (patch) | |
| tree | 9ac5219fc25700a78e5ad934ba1372482f6fb5ba /nx-X11/programs/Xserver | |
| parent | ace255eda62081526b721e82ed0339c566975ad3 (diff) | |
| download | nx-libs-184c5d778210dea8eab045a5f7ecf9d4344c1c34.tar.gz nx-libs-184c5d778210dea8eab045a5f7ecf9d4344c1c34.tar.bz2 nx-libs-184c5d778210dea8eab045a5f7ecf9d4344c1c34.zip | |
drop platform support: unifdef hpux and __hppa__.
Fixes ArcticaProject/nx-libs#273.
Diffstat (limited to 'nx-X11/programs/Xserver')
| -rw-r--r-- | nx-X11/programs/Xserver/include/servermd.h | 8 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/access.c | 8 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/connection.c | 10 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/osdep.h | 2 |
4 files changed, 8 insertions, 20 deletions
diff --git a/nx-X11/programs/Xserver/include/servermd.h b/nx-X11/programs/Xserver/include/servermd.h index 4f2dc27f8..5d26c3f7d 100644 --- a/nx-X11/programs/Xserver/include/servermd.h +++ b/nx-X11/programs/Xserver/include/servermd.h @@ -114,14 +114,6 @@ SOFTWARE. #endif /* __aarch64__ */ -#if defined (hpux) || defined __hppa__ - -#define IMAGE_BYTE_ORDER MSBFirst -#define BITMAP_BIT_ORDER MSBFirst -#define GLYPHPADBYTES 4 /* to make fb work */ - -#endif /* hpux || __hppa__ */ - #if defined(__powerpc__) || defined(__ppc__) #define IMAGE_BYTE_ORDER MSBFirst diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c index 286e978ba..de81c5141 100644 --- a/nx-X11/programs/Xserver/os/access.c +++ b/nx-X11/programs/Xserver/os/access.c @@ -105,7 +105,7 @@ SOFTWARE. #endif -#if defined(hpux) || defined(QNX4) +#if defined(QNX4) # include <sys/utsname.h> # ifdef HAS_IFREQ # include <net/if.h> @@ -127,7 +127,7 @@ SOFTWARE. #else /*!__GNU__*/ # include <net/if.h> #endif /*__GNU__ */ -#endif /* hpux */ +#endif /* QNX4 */ #ifdef SVR4 #include <sys/sockio.h> @@ -513,7 +513,7 @@ DefineSelf (int fd) #else /* WINTCP */ -#if !defined(SIOCGIFCONF) || (defined (hpux) && ! defined (HAS_IFREQ)) || defined(QNX4) +#if !defined(SIOCGIFCONF) || defined(QNX4) void DefineSelf (int fd) { @@ -1047,7 +1047,7 @@ DefineSelf (int fd) } } } -#endif /* hpux && !HAS_IFREQ */ +#endif /* SIOCGIFCONF || QNX4 */ #endif /* WINTCP */ #ifdef XDMCP diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c index 41234e231..60bcc6bb8 100644 --- a/nx-X11/programs/Xserver/os/connection.c +++ b/nx-X11/programs/Xserver/os/connection.c @@ -82,11 +82,6 @@ SOFTWARE. #ifndef WIN32 #include <sys/socket.h> -#ifdef hpux -#include <sys/utsname.h> -#include <sys/ioctl.h> -#endif - #if defined(DGUX) #include <sys/ioctl.h> #include <sys/utsname.h> @@ -106,7 +101,9 @@ SOFTWARE. #if defined(TCPCONN) # include <netinet/in.h> # include <arpa/inet.h> -# if !defined(hpux) + +/* FIXME: correct indentation levels after ancient platform support clean-up */ + # ifdef apollo # ifndef NO_TCP_H # include <netinet/tcp.h> @@ -117,7 +114,6 @@ SOFTWARE. # endif # include <netinet/tcp.h> # endif -# endif # include <arpa/inet.h> #endif diff --git a/nx-X11/programs/Xserver/os/osdep.h b/nx-X11/programs/Xserver/os/osdep.h index 3215b017e..6f38a2180 100644 --- a/nx-X11/programs/Xserver/os/osdep.h +++ b/nx-X11/programs/Xserver/os/osdep.h @@ -117,7 +117,7 @@ SOFTWARE. /* MAXSELECT is the number of fds that select() can handle */ #define MAXSELECT (sizeof(fd_set) * NBBY) -#if !defined(hpux) && !defined(SVR4) && !defined(SYSV) +#if !defined(SVR4) && !defined(SYSV) #define HAS_GETDTABLESIZE #endif |