diff options
| author | Erik Sohns <erik.sohns@posteo.de> | 2023-04-05 17:37:54 +0200 |
|---|---|---|
| committer | Erik Sohns <erik.sohns@posteo.de> | 2023-04-05 17:37:54 +0200 |
| commit | 761e24b54d7fda41ed58a6e2f41ba905e43bf3d9 (patch) | |
| tree | 69171a8ba215e125cf273ab6bbe4641313df6e6a /ACE/tests/Unload_libACE.cpp | |
| parent | 3e44fb91cf724aeb48b38169482a4878de316afc (diff) | |
| parent | 9e18d338ec598e1a8da6d32a0fba5a20c76978f7 (diff) | |
| download | ATCD-761e24b54d7fda41ed58a6e2f41ba905e43bf3d9.tar.gz | |
Merge branch 'message_queue_ex_get_queue' of https://github.com/esohns/ACE_TAO into message_queue_ex_get_queue
Diffstat (limited to 'ACE/tests/Unload_libACE.cpp')
| -rw-r--r-- | ACE/tests/Unload_libACE.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/ACE/tests/Unload_libACE.cpp b/ACE/tests/Unload_libACE.cpp index b1a1b2d831b..17088486a32 100644 --- a/ACE/tests/Unload_libACE.cpp +++ b/ACE/tests/Unload_libACE.cpp @@ -26,10 +26,6 @@ #endif /* !ACE_VXWORKS && !__MINGW32__ && !CYGWIN32 */ #endif /* __GNUC__ */ -#if defined (__hpux) || defined (__SUNPRO_CC) -#define UNLOAD_LIBACE_TEST 1 -#endif /* (__hpux) || (__SUNPRO_CC) */ - #if defined (ACE_AS_STATIC_LIBS) #undef UNLOAD_LIBACE_TEST #endif /* ACE_AS_STATIC_LIBS */ @@ -160,9 +156,7 @@ main (int, char **) #else strcat (buf, "ACE"); #endif /* ACE_LIB_NAME */ -#if defined (__hpux) && !(defined (__ia64) && (__ia64 == 1)) - strcat (buf, ".sl"); -#elif defined (__APPLE__) +#if defined (__APPLE__) strcat (buf, ".dylib"); #else strcat (buf, ".so"); @@ -240,11 +234,9 @@ main (int, char **) #else # if defined (WIN32) && defined (ACE_USES_WCHAR) // Borrow include list from ace_wchar.h -# if defined (ACE_HAS_WINCE) -# include /**/ <wtypes.h> -# elif !defined (__BORLANDC__) +# if !defined (__BORLANDC__) # include /**/ <wchar.h> -# endif /* ACE_HAS_WINCE || __BORLANDC__ */ +# endif /* __BORLANDC__ */ int wmain (int, wchar_t **) |