Compile fixes for PGI C++.

committer: mfx <mfx> 1071917829 +0000
2003-12-20 10:57:09 +00:00
parent b9c976304a
commit 97153e8e09
14 changed files with 44 additions and 23 deletions
@@ -116,10 +116,12 @@
 #undef linux
 #undef small
 #undef tos
-#undef unix
-#if defined(__DMC__)
+#if defined(ACC_CC_DMC)
 #  undef tell
 #endif
+#if !defined(ACC_CC_PGI)
+#  undef unix
+#endif
 #if defined(__DJGPP__)
 #  undef sopen
 #  undef __unix__
@@ -149,7 +151,7 @@
 #    define UPX_E_OK      UCL_E_OK
 #    define UPX_E_ERROR   UCL_E_ERROR
 #    define UPX_E_OUT_OF_MEMORY UCL_E_OUT_OF_MEMORY
-#    define __UPX_ENTRY   __UCL_ENTRY
+#    define __UPX_CDECL   __UCL_CDECL
 #  endif
 #endif
 #if defined(WITH_NRV)