diff options
| author | Erik Sohns <esohns@users.noreply.github.com> | 2023-01-22 17:38:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-22 17:38:34 +0100 |
| commit | 9e18d338ec598e1a8da6d32a0fba5a20c76978f7 (patch) | |
| tree | 045f42001bd4e15cf8285686798fe47acd2f2b60 /ACE/ace/os_include/os_dlfcn.h | |
| parent | 8b6ad82dc91f728cea2c9e86a17e5969a3338fcc (diff) | |
| parent | 8ab31e3e5bb8c09a9c326a54545f4cb475345a78 (diff) | |
| download | ATCD-9e18d338ec598e1a8da6d32a0fba5a20c76978f7.tar.gz | |
Merge branch 'master' into message_queue_ex_get_queue
Diffstat (limited to 'ACE/ace/os_include/os_dlfcn.h')
| -rw-r--r-- | ACE/ace/os_include/os_dlfcn.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/ACE/ace/os_include/os_dlfcn.h b/ACE/ace/os_include/os_dlfcn.h index d13d5ca5ce7..76b75cc082d 100644 --- a/ACE/ace/os_include/os_dlfcn.h +++ b/ACE/ace/os_include/os_dlfcn.h @@ -26,10 +26,6 @@ # include /**/ <dlfcn.h> #endif /* !ACE_LACKS_DLFCN_H */ -#if defined (__hpux) -# include /**/ <dl.h> -#endif /* __hpux */ - #if defined (ACE_VXWORKS) && !defined (__RTP__) # include /**/ <loadLib.h> /* for module load */ # include /**/ <unldLib.h> /* for module unload */ @@ -66,15 +62,7 @@ extern "C" # if !defined (ACE_DEFAULT_SHLIB_MODE) # define ACE_DEFAULT_SHLIB_MODE RTLD_LAZY | RTLD_GLOBAL # endif -#elif defined (__hpux) - typedef shl_t ACE_SHLIB_HANDLE; -# if !defined (ACE_SHLIB_INVALID_HANDLE) -# define ACE_SHLIB_INVALID_HANDLE 0 -# endif /* ACE_SHLIB_INVALID_HANDLE */ -# if !defined (ACE_DEFAULT_SHLIB_MODE) -# define ACE_DEFAULT_SHLIB_MODE BIND_DEFERRED | DYNAMIC_PATH -# endif /* ACE_DEFAULT_SHLIB_MODE */ -#else /* !ACE_WIN32 && !ACE_HAS_SVR4_DYNAMIC_LINKING && !__hpux */ +#else /* !ACE_WIN32 && !ACE_HAS_SVR4_DYNAMIC_LINKING */ typedef void *ACE_SHLIB_HANDLE; # if !defined (ACE_SHLIB_INVALID_HANDLE) # define ACE_SHLIB_INVALID_HANDLE 0 |