diff options
Diffstat (limited to 'sal/osl')
| -rw-r--r-- | sal/osl/os2/system.h | 30 | ||||
| -rw-r--r-- | sal/osl/unx/process.c | 26 | ||||
| -rw-r--r-- | sal/osl/unx/system.h | 29 |
3 files changed, 2 insertions, 83 deletions
diff --git a/sal/osl/os2/system.h b/sal/osl/os2/system.h index e3c466d64..be105cb81 100644 --- a/sal/osl/os2/system.h +++ b/sal/osl/os2/system.h @@ -276,34 +276,6 @@ extern unsigned int nanosleep(unsigned int); # define NO_DL_FUNCTIONS #endif -#ifdef HPUX -# define AF_IPX -1 -# undef howmany -# undef MAXINT -# include <pthread.h> -# include <sys/un.h> -# include <sys/sched.h> -# include <sys/xti.h> -# include <sys/pstat.h> -# include <shadow.h> -# include <crypt.h> -# include <machine/param.h> -# define LIBPATH "SHLIB_PATH" -# define PTR_SIZE_T(s) ((int *)&(s)) -# define PTR_FD_SET(s) ((int *)&(s)) -# define PTHREAD_VALUE(t) ((t).field2) -# define PTHREAD_NONE_INIT { 0, -1 } -# define PTHREAD_ATTR_DEFAULT pthread_attr_default -# define PTHREAD_MUTEXATTR_DEFAULT pthread_mutexattr_default -# define PTHREAD_CONDATTR_DEFAULT pthread_condattr_default -# define pthread_detach(t) pthread_detach(&(t)) -# define NO_PTHREAD_PRIORITY -# define NO_PTHREAD_SEMAPHORES -# define NO_DL_FUNCTIONS -# undef sigaction -# define PTHREAD_SIGACTION cma_sigaction -#endif - #ifdef SOLARIS # include <shadow.h> # include <sys/procfs.h> @@ -356,7 +328,7 @@ char *macxp_tempnam( const char *tmpdir, const char *prefix ); #if !defined(_WIN32) && !defined(_WIN16) && !defined(OS2) && \ !defined(LINUX) && !defined(NETBSD) && !defined(FREEBSD) && !defined(SCO) && \ - !defined(AIX) && !defined(HPUX) && \ + !defined(AIX) && \ !defined(SOLARIS) && !defined(MAC) && \ !defined(MACOSX) # error "Target plattform not specified !" diff --git a/sal/osl/unx/process.c b/sal/osl/unx/process.c index e736a2510..63dc7cb4b 100644 --- a/sal/osl/unx/process.c +++ b/sal/osl/unx/process.c @@ -1351,32 +1351,6 @@ oslProcessError SAL_CALL osl_getProcessInfo(oslProcess Process, oslProcessData F close(fd); } -#elif defined(HPUX) - - struct pst_status prstatus; - - if (pstat_getproc(&prstatus, sizeof(prstatus), (size_t)0, pid) == 1) - { - if (Fields & osl_Process_CPUTIMES) - { - pInfo->UserTime.Seconds = prstatus.pst_utime; - pInfo->UserTime.Nanosec = 500000L; - pInfo->SystemTime.Seconds = prstatus.pst_stime; - pInfo->SystemTime.Nanosec = 500000L; - - pInfo->Fields |= osl_Process_CPUTIMES; - } - - if (Fields & osl_Process_HEAPUSAGE) - { - pInfo->HeapUsage = prstatus.pst_vdsize*PAGESIZE; - - pInfo->Fields |= osl_Process_HEAPUSAGE; - } - - return (pInfo->Fields == Fields) ? osl_Process_E_None : osl_Process_E_Unknown; - } - #elif defined(LINUX) if ( (Fields & osl_Process_CPUTIMES) || (Fields & osl_Process_HEAPUSAGE) ) diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h index 047a643a9..fa9c58cb8 100644 --- a/sal/osl/unx/system.h +++ b/sal/osl/unx/system.h @@ -300,33 +300,6 @@ extern unsigned int nanosleep(unsigned int); # define NO_PTHREAD_SEMAPHORES #endif -#ifdef HPUX -# define AF_IPX -1 -# undef howmany -# undef MAXINT -# include <pthread.h> -# include <sys/un.h> -# include <sys/sched.h> -# include <sys/xti.h> -# include <sys/pstat.h> -# include <shadow.h> -# include <crypt.h> -# include <machine/param.h> -# define LIBPATH "SHLIB_PATH" -# define PTR_FD_SET(s) ((int *)&(s)) -# define PTHREAD_VALUE(t) ((t).field2) -# define PTHREAD_NONE_INIT { 0, -1 } -# define PTHREAD_ATTR_DEFAULT pthread_attr_default -# define PTHREAD_MUTEXATTR_DEFAULT pthread_mutexattr_default -# define PTHREAD_CONDATTR_DEFAULT pthread_condattr_default -# define pthread_detach(t) pthread_detach(&(t)) -# define NO_PTHREAD_PRIORITY -# define NO_PTHREAD_SEMAPHORES -# define NO_DL_FUNCTIONS -# undef sigaction -# define PTHREAD_SIGACTION cma_sigaction -#endif - #ifdef SOLARIS # include <shadow.h> # include <sys/un.h> @@ -392,7 +365,7 @@ int macxp_resolveAlias(char *path, int buflen); #if !defined(_WIN32) && !defined(_WIN16) && !defined(OS2) && \ !defined(LINUX) && !defined(NETBSD) && !defined(FREEBSD) && !defined(SCO) && \ - !defined(AIX) && !defined(HPUX) && \ + !defined(AIX) && \ !defined(SOLARIS) && !defined(MACOSX) && \ !defined(OPENBSD) && !defined(DRAGONFLY) # error "Target platform not specified!" |