jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Renamed the options sub-structs for more consistency. Some portab fixes.

Browse Source 
committer: mfx <mfx> 1058221575 +0000
This commit is contained in:
Markus F.X.J. Oberhumer
2003-07-14 22:26:15 +00:00
parent f9054529c1
commit 48ec581539
18 changed files with 127 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/conf.h
+17 -20
View File
@@ -53,18 +53,18 @@
# if (__BORLANDC__ < 0x550)
# error "need Borland C++ 5.5 or newer"
# endif
# define __UPX_CDECL __cdecl
# if (__BORLANDC__ >= 0x560)
# pragma warn -use
# endif
#elif (ACC_CC_DMC)
# define __UPX_CDECL __cdecl
# if (__DMC__ < 0x829)
# error "need Digital Mars C++ 8.29 or newer"
# endif
#elif (ACC_CC_INTELC)
# if (__INTEL_COMPILER < 450)
# error "need Intel C++ 4.5 or newer"
# endif
# if (ACC_CC_WIN32 || ACC_CC_WIN64)
# define __UPX_CDECL __cdecl
# if (ACC_OS_WIN32 || ACC_OS_WIN64)
# elif defined(__linux__)
# pragma warning(error: 424) // #424: extra ";" ignored
# pragma warning(disable: 193) // #193: zero used for undefined preprocessing identifier
@@ -78,8 +78,9 @@
# if (_MSC_VER < 1100)
# error "need Visual C++ 5.0 or newer"
# endif
# define __UPX_CDECL __cdecl
# pragma warning(disable: 4096) // __cdecl + '...'
#if 0
# pragma warning(disable: 4096) // W2: '__cdecl' must be used with '...'
#endif
# pragma warning(disable: 4097) // W3: typedef-name 'A' used as synonym for class-name 'B'
# pragma warning(disable: 4511) // W3: 'class': copy constructor could not be generated
# pragma warning(disable: 4512) // W4: 'class': assignment operator could not be generated
@@ -94,10 +95,6 @@
# endif
#endif
#if !defined(__UPX_CDECL)
# define __UPX_CDECL
#endif
/*************************************************************************
//
@@ -453,26 +450,26 @@ void printClearLine(FILE *f = NULL);
void printErr(const char *iname, const Throwable *e);
void printUnhandledException(const char *iname, const std::exception *e);
#if defined(__GNUC__)
void printErr(const char *iname, const char *format, ...)
void __acc_cdecl printErr(const char *iname, const char *format, ...)
__attribute__((format(printf,2,3)));
void printWarn(const char *iname, const char *format, ...)
void __acc_cdecl printWarn(const char *iname, const char *format, ...)
__attribute__((format(printf,2,3)));
#else
void printErr(const char *iname, const char *format, ...);
void printWarn(const char *iname, const char *format, ...);
void __acc_cdecl printErr(const char *iname, const char *format, ...);
void __acc_cdecl printWarn(const char *iname, const char *format, ...);
#endif
#if defined(__GNUC__)
void infoWarning(const char *format, ...)
void __acc_cdecl infoWarning(const char *format, ...)
__attribute__((format(printf,1,2)));
void infoHeader(const char *format, ...)
void __acc_cdecl infoHeader(const char *format, ...)
__attribute__((format(printf,1,2)));
void info(const char *format, ...)
void __acc_cdecl info(const char *format, ...)
__attribute__((format(printf,1,2)));
#else
void infoWarning(const char *format, ...);
void infoHeader(const char *format, ...);
void info(const char *format, ...);
void __acc_cdecl infoWarning(const char *format, ...);
void __acc_cdecl infoHeader(const char *format, ...);
void __acc_cdecl info(const char *format, ...);
#endif
void infoHeader();
void infoWriting(const char *what, long size);