aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nx-X11/config/cf/Imake.cf19
-rw-r--r--nx-X11/config/cf/Imake.tmpl2
-rw-r--r--nx-X11/config/cf/linux.cf21
-rw-r--r--nx-X11/config/cf/xorg.cf2
-rw-r--r--nx-X11/extras/Mesa/src/mesa/main/imports.h1
-rw-r--r--nx-X11/include/Xmd.h1
-rw-r--r--nx-X11/include/Xos_r.h4
-rw-r--r--nx-X11/include/Xpoll.h.in20
-rw-r--r--nx-X11/lib/X11/AuGetBest.c35
-rw-r--r--nx-X11/lib/X11/CrGlCur.c31
-rw-r--r--nx-X11/lib/X11/SetLocale.c17
-rw-r--r--nx-X11/lib/X11/XlcDL.c52
-rw-r--r--nx-X11/lib/X11/XlibInt.c2
-rw-r--r--nx-X11/programs/Xserver/include/servermd.h8
-rw-r--r--nx-X11/programs/Xserver/os/access.c8
-rw-r--r--nx-X11/programs/Xserver/os/connection.c10
-rw-r--r--nx-X11/programs/Xserver/os/osdep.h2
17 files changed, 19 insertions, 216 deletions
diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf
index 69c3a0670..98655ec56 100644
--- a/nx-X11/config/cf/Imake.cf
+++ b/nx-X11/config/cf/Imake.cf
@@ -184,12 +184,6 @@
# undef __vax__
# define VaxArchitecture
# endif
-# ifdef __hppa__
-# ifndef HPArchitecture
-# define HPArchitecture
-# endif
-# undef __hppa__
-# endif /* __hppa__ */
#endif /* OpenBSD */
/* Systems based on kernel of OpenBSD */
@@ -374,13 +368,6 @@
# define SunArchitecture
#endif /* sun */
-#ifdef hpux
-# define MacroIncludeFile <hp.cf>
-# define MacroFile hp.cf
-# undef hpux
-# define HPArchitecture
-#endif /* hpux */
-
#ifdef __SCO__
# define MacroIncludeFile <sco5.cf>
# define MacroFile sco5.cf
@@ -947,12 +934,6 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
# undef MIPSEL
# undef _MIPSEL
# endif
-# ifdef __hppa__
-# ifndef HPArchitecture
-# define HPArchitecture
-# endif
-# undef __hppa__
-# endif /* __hppa__ */
# ifdef __sh__
# ifndef SuperHArchitecture
# define SuperHArchitecture
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index 1488c9a32..e8e1fb09b 100644
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -515,8 +515,6 @@ XCOMM the platform-specific parameters - edit site.def to change
#define ByteOrder X_BIG_ENDIAN
#elif defined(PpcArchitecture) || defined(Ppc64Architecture)
#define ByteOrder X_BIG_ENDIAN
-#elif defined(HPArchitecture)
-#define ByteOrder X_BIG_ENDIAN
#elif defined(SuperHArchitecture)
#define ByteOrder X_LITTLE_ENDIAN
#elif defined(SuperHebArchitecture)
diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf
index c6ae58474..1a3f6bc5b 100644
--- a/nx-X11/config/cf/linux.cf
+++ b/nx-X11/config/cf/linux.cf
@@ -535,13 +535,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define LdCmd CcCmd -nostdlib -Wl,"-m alpha"
# define AsmDefines -DUSE_GAS -U__ELF__
# endif /* AlphaArchitecture */
-# ifdef HPArchitecture
-# define CcCmd gcc
-# define CplusplusCmd g++
-# define AsCmd CcCmd -c -x assembler
-# define LdCmd CcCmd -nostdlib
-# define AsmDefines -DUSE_GAS -U__ELF__
-# endif /* HPArchitecture */
# ifdef i386Architecture
# define CcCmd gcc -b i486-linuxaout
# define CplusplusCmd g++ -b i486-linuxaout
@@ -580,13 +573,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define AsmDefines -D__ELF__
# define CplusplusCmd c++ -b alpha-linux
# endif /* AlphaArchitecture */
-# ifdef HPArchitecture
-# define CcCmd gcc
-# define CplusplusCmd g++
-# define AsCmd CcCmd -c -x assembler
-# define LdCmd CcCmd -nostdlib
-# define AsmDefines -D__ELF__
-# endif /* HPArchitecture */
# ifdef i386Architecture
# define CcCmd gcc -b i486-linux
# define AsCmd CcCmd -c -x assembler
@@ -708,13 +694,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
#endif /* Arm64Achitecture */
-#ifdef HPArchitecture
-# define OptimizedCDebugFlags -O2 GccAliasingArgs
-# define LinuxMachineDefines -D__hppa__
-# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-#endif
-
#ifdef i386Architecture
# ifndef OptimizedCDebugFlags
# define OptimizedCDebugFlags DefaultGcc2i386Opt
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index fbec1b0d1..2b71b90ec 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -244,7 +244,7 @@ NX_VERSION_CURRENT_STRING = nxVersionString
defined(Sparc64Architecture) || defined(MipsArchitecture) || \
defined(AlphaArchitecture) || defined(PpcArchitecture) || \
defined(Mc68020Architecture) || defined(Arm32Architecture) || \
- defined(HPArchitecture) || defined(SuperHArchitecture)
+ defined(SuperHArchitecture)
# ifndef XorgServer
# define XorgServer YES
# endif
diff --git a/nx-X11/extras/Mesa/src/mesa/main/imports.h b/nx-X11/extras/Mesa/src/mesa/main/imports.h
index 7c7a90a74..fd9c362ee 100644
--- a/nx-X11/extras/Mesa/src/mesa/main/imports.h
+++ b/nx-X11/extras/Mesa/src/mesa/main/imports.h
@@ -202,7 +202,6 @@ typedef union { GLfloat f; GLint i; } fi_type;
defined(__s390x__) || defined(__powerpc__) || \
defined(__amd64__) || \
defined(ia64) || defined(__ia64__) || \
- defined(__hppa__) || defined(hpux) || \
defined(__mips) || defined(_MIPS_ARCH) || \
defined(__arm__) || \
defined(__sh__) || \
diff --git a/nx-X11/include/Xmd.h b/nx-X11/include/Xmd.h
index 83d22a47f..a1e165d4d 100644
--- a/nx-X11/include/Xmd.h
+++ b/nx-X11/include/Xmd.h
@@ -58,7 +58,6 @@ SOFTWARE.
defined(__ia64__) || defined(ia64) || \
defined(__sparc64__) || \
defined(__s390x__) || \
- (defined(__hppa__) && defined(__LP64__)) || \
defined(__amd64__) || defined(amd64) || \
defined(__powerpc64__) || \
(defined(sgi) && (_MIPS_SZLONG == 64))
diff --git a/nx-X11/include/Xos_r.h b/nx-X11/include/Xos_r.h
index 44a3690ba..138efd704 100644
--- a/nx-X11/include/Xos_r.h
+++ b/nx-X11/include/Xos_r.h
@@ -927,8 +927,8 @@ typedef struct {
(_Xos_processUnlock), \
(p).result )
-#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && (defined(__osf__) || defined(hpV4))
-/* Returns (int)0 on success. OSF/1 v3.2, HP/UX 10
+#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && (defined(__osf__)
+/* Returns (int)0 on success. OSF/1 v3.2
*
* extern int asctime_r(const struct tm *timeptr, char *buffer, int buflen);
* extern int ctime_r(const time_t *timer, char *buffer, int buflen);
diff --git a/nx-X11/include/Xpoll.h.in b/nx-X11/include/Xpoll.h.in
index 47a0341e2..4d720a742 100644
--- a/nx-X11/include/Xpoll.h.in
+++ b/nx-X11/include/Xpoll.h.in
@@ -149,27 +149,11 @@ typedef struct fd_set {
extern int _XSelect(int maxfds, fd_set *readfds, fd_set *writefds,
fd_set *exceptfds, struct timeval *timeout);
-#ifndef hpux /* and perhaps old BSD ??? */
-# define Select(n,r,w,e,t) _XSelect(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-#else
-# ifndef _XPG4_EXTENDED /* HPUX 9.x and earlier */
-# define Select(n,r,w,e,t) _XSelect(n,(int*)r,(int*)w,(int*)e,(struct timeval*)t)
-# else
-# define Select(n,r,w,e,t) _XSelect(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-# endif
-#endif
+#define Select(n,r,w,e,t) _XSelect(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
#else /* #ifdef NX_TRANS_SOCKET */
-#ifndef hpux /* and perhaps old BSD ??? */
-# define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-#else
-# ifndef _XPG4_EXTENDED /* HPUX 9.x and earlier */
-# define Select(n,r,w,e,t) select(n,(int*)r,(int*)w,(int*)e,(struct timeval*)t)
-# else
-# define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-# endif
-#endif
+#define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
#endif /* #ifdef NX_TRANS_SOCKET */
diff --git a/nx-X11/lib/X11/AuGetBest.c b/nx-X11/lib/X11/AuGetBest.c
index fce9ddead..2518805cc 100644
--- a/nx-X11/lib/X11/AuGetBest.c
+++ b/nx-X11/lib/X11/AuGetBest.c
@@ -33,11 +33,6 @@ in this Software without prior written authorization from The Open Group.
#ifdef XTHREADS
#include <nx-X11/Xthreads.h>
#endif
-#ifdef hpux
-#define X_INCLUDE_NETDB_H
-#define XOS_USE_NO_LOCKING
-#include <nx-X11/Xos_r.h>
-#endif
static int
binaryEqual (_Xconst char *a, _Xconst char *b, int len)
@@ -74,10 +69,6 @@ XauGetBestAuthByAddr (
Xauth *best;
int best_type;
int type;
-#ifdef hpux
- char *fully_qual_address;
- unsigned short fully_qual_address_length;
-#endif
auth_name = XauFileName ();
if (!auth_name)
@@ -88,26 +79,6 @@ XauGetBestAuthByAddr (
if (!auth_file)
return 0;
-#ifdef hpux
- if (family == FamilyLocal) {
-#ifdef XTHREADS_NEEDS_BYNAMEPARAMS
- _Xgethostbynameparams hparams;
-#endif
- struct hostent *hostp;
-
- /* make sure we try fully-qualified hostname */
- if ((hostp = _XGethostbyname(address,hparams)) != NULL) {
- fully_qual_address = hostp->h_name;
- fully_qual_address_length = strlen(fully_qual_address);
- }
- else
- {
- fully_qual_address = NULL;
- fully_qual_address_length = 0;
- }
- }
-#endif /* hpux */
-
best = 0;
best_type = types_length;
for (;;) {
@@ -131,12 +102,6 @@ XauGetBestAuthByAddr (
(entry->family == family &&
((address_length == entry->address_length &&
binaryEqual (entry->address, address, (int)address_length))
-#ifdef hpux
- || (family == FamilyLocal &&
- fully_qual_address_length == entry->address_length &&
- binaryEqual (entry->address, fully_qual_address,
- (int) fully_qual_address_length))
-#endif
))) &&
(number_length == 0 || entry->number_length == 0 ||
(number_length == entry->number_length &&
diff --git a/nx-X11/lib/X11/CrGlCur.c b/nx-X11/lib/X11/CrGlCur.c
index 11c047097..88133b7f4 100644
--- a/nx-X11/lib/X11/CrGlCur.c
+++ b/nx-X11/lib/X11/CrGlCur.c
@@ -33,22 +33,14 @@ in this Software without prior written authorization from The Open Group.
#include <stdio.h>
#include <string.h>
-#if defined(hpux)
-#include <dl.h>
-#else
#include <dlfcn.h>
-#endif
#include "Cr.h"
#ifdef __CYGWIN__
#define LIBXCURSOR "cygXcursor-1.dll"
#endif
-#if defined(hpux)
-typedef shl_t XModuleType;
-#else
typedef void *XModuleType;
-#endif
#ifndef LIBXCURSOR
#define LIBXCURSOR "libXcursor.so.1"
@@ -64,11 +56,7 @@ open_library (void)
XModuleType module;
for (;;)
{
-#if defined(hpux)
- module = shl_load(library, BIND_DEFERRED, 0L);
-#else
module = dlopen(library, RTLD_LAZY);
-#endif
if (module)
return module;
dot = strrchr (library, '.');
@@ -84,28 +72,9 @@ fetch_symbol (XModuleType module, const char *under_symbol)
{
void *result = NULL;
const char *symbol = under_symbol + 1;
-#if defined(hpux)
- int getsyms_cnt, i;
- struct shl_symbol *symbols;
-
- getsyms_cnt = shl_getsymbols(module, TYPE_PROCEDURE,
- EXPORT_SYMBOLS, malloc, &symbols);
-
- for(i=0; i<getsyms_cnt; i++) {
- if(!strcmp(symbols[i].name, symbol)) {
- result = symbols[i].value;
- break;
- }
- }
-
- if(getsyms_cnt > 0) {
- free(symbols);
- }
-#else
result = dlsym (module, symbol);
if (!result)
result = dlsym (module, under_symbol);
-#endif
return result;
}
diff --git a/nx-X11/lib/X11/SetLocale.c b/nx-X11/lib/X11/SetLocale.c
index e14fdaef6..832976ee3 100644
--- a/nx-X11/lib/X11/SetLocale.c
+++ b/nx-X11/lib/X11/SetLocale.c
@@ -99,18 +99,10 @@ _XlcMapOSLocaleName(
char *osname,
char *siname)
{
-#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32) || defined(linux)
-# ifdef hpux
-# ifndef _LastCategory
- /* HPUX 9 and earlier */
-# define SKIPCOUNT 2
-# define STARTCHAR ':'
-# define ENDCHAR ';'
-# else
- /* HPUX 10 */
-# define ENDCHAR ' '
-# endif
-# else
+
+/* FIXME: correct indentation levels after ancient platform clean-up */
+
+#if defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32) || defined(linux)
# ifdef ultrix
# define SKIPCOUNT 2
# define STARTCHAR '\001'
@@ -138,7 +130,6 @@ _XlcMapOSLocaleName(
# endif
# endif
# endif
-# endif
char *start;
char *end;
diff --git a/nx-X11/lib/X11/XlcDL.c b/nx-X11/lib/X11/XlcDL.c
index bc71900a0..032bcf51c 100644
--- a/nx-X11/lib/X11/XlcDL.c
+++ b/nx-X11/lib/X11/XlcDL.c
@@ -63,11 +63,7 @@ Sun Microsystems, Inc. or its licensors is granted.
#ifdef HAVE_CONFIG_H
# include <config.h>
#else
-# if defined(hpux)
-# define HAVE_DL_H
-# else
-# define HAVE_DLFCN_H
-# endif
+# define HAVE_DLFCN_H
#endif
#include <stdio.h>
@@ -106,11 +102,7 @@ typedef struct {
char *im_unregister;
int dl_release;
unsigned int refcount;
-#if defined(hpux)
- shl_t dl_module;
-#else
void *dl_module;
-#endif
} XI18NObjectsListRec, *XI18NObjectsList;
#define OBJECT_INIT_LEN 8
@@ -156,7 +148,6 @@ strdup_with_underscore(const char *symbol)
return result;
}
-#ifndef hpux
static void *
try_both_dlsym (void *handle, char *name)
{
@@ -174,7 +165,6 @@ try_both_dlsym (void *handle, char *name)
}
return ret;
}
-#endif
static void
resolve_object(char *path, const char *lc_name)
@@ -301,11 +291,7 @@ open_object(
path = __lc_path(object->dl_name, lc_dir);
if (!path)
return False;
-#if defined(hpux)
- object->dl_module = shl_load(path, BIND_DEFERRED, 0L);
-#else
object->dl_module = dlopen(path, RTLD_LAZY);
-#endif
Xfree(path);
if (!object->dl_module)
@@ -322,31 +308,11 @@ fetch_symbol(
char *symbol)
{
void *result = NULL;
-#if defined(hpux)
- int getsyms_cnt, i;
- struct shl_symbol *symbols;
-#endif
if (symbol == NULL)
return NULL;
-#if defined(hpux)
- getsyms_cnt = shl_getsymbols(object->dl_module, TYPE_PROCEDURE,
- EXPORT_SYMBOLS, malloc, &symbols);
-
- for(i=0; i<getsyms_cnt; i++) {
- if(!strcmp(symbols[i].name, symbol)) {
- result = symbols[i].value;
- break;
- }
- }
-
- if(getsyms_cnt > 0) {
- free(symbols);
- }
-#else
result = try_both_dlsym(object->dl_module, symbol);
-#endif
return result;
}
@@ -357,11 +323,7 @@ close_object(XI18NObjectsList object)
object->refcount--;
if (object->refcount == 0)
{
-#if defined(hpux)
- shl_unload(object->dl_module);
-#else
dlclose(object->dl_module);
-#endif
object->dl_module = NULL;
}
}
@@ -466,10 +428,6 @@ _XDynamicRegisterIMInstantiateCallback(
Bool ret_flag = False;
int count;
XI18NObjectsList objects_list = xi18n_objects_list;
-#if defined(hpux)
- int getsyms_cnt, i;
- struct shl_symbol *symbols;
-#endif
lc_name = lcd->core->name;
@@ -514,10 +472,6 @@ _XDynamicUnRegisterIMInstantiateCallback(
Bool ret_flag = False;
int count;
XI18NObjectsList objects_list = xi18n_objects_list;
-#if defined(hpux)
- int getsyms_cnt, i;
- struct shl_symbol *symbols;
-#endif
lc_name = lcd->core->name;
if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return False;
@@ -570,10 +524,6 @@ _XDynamicOpenOM(XLCd lcd, Display *display, XrmDatabase rdb,
char *lc_name;
dynamicIOpenProcp om_openOM = (dynamicIOpenProcp)NULL;
XI18NObjectsList objects_list = xi18n_objects_list;
-#if defined(hpux)
- int getsyms_cnt, i;
- struct shl_symbol *symbols;
-#endif
lc_name = lcd->core->name;
diff --git a/nx-X11/lib/X11/XlibInt.c b/nx-X11/lib/X11/XlibInt.c
index bae224ee1..bece819cf 100644
--- a/nx-X11/lib/X11/XlibInt.c
+++ b/nx-X11/lib/X11/XlibInt.c
@@ -3891,7 +3891,7 @@ _XData32(
* and so, you may be better off using gethostname (if it exists).
*/
-#if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(SVR4)
+#if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(SVR4)
#define NEED_UTSNAME
#include <sys/utsname.h>
#else
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