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

Small conf.h update.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2009-01-01 13:40:52 +01:00
parent 5ed689ceb0
commit 57a64de023
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/conf.h
+2 -2
View File
@@ -107,8 +107,8 @@
#elif (ACC_CC_SUNPROC) #elif (ACC_CC_SUNPROC)
//# pragma error_messages(off,"badargtype2w") // FIXME //# pragma error_messages(off,"badargtype2w") // FIXME
#elif (ACC_CC_WATCOMC) #elif (ACC_CC_WATCOMC)
# if (__WATCOMC__ < 1100) # if (__WATCOMC__ < 1280)
# error "need Watcom C++ 11.0c or newer" # error "need Open Watcom C++ 1.8 or newer" // because earlier versions do not support nested classes
# endif # endif
# if defined(__cplusplus) # if defined(__cplusplus)
# pragma warning 367 9 // w3: conditional expression in if statement is always true # pragma warning 367 9 // w3: conditional expression in if statement is always true
src/p_lx_elf.cpp
+1 -1
View File
@@ -846,7 +846,7 @@ bool PackLinuxElf32::canPack()
{ {
union { union {
unsigned char buf[sizeof(Elf32_Ehdr) + 14*sizeof(Elf32_Phdr)]; unsigned char buf[sizeof(Elf32_Ehdr) + 14*sizeof(Elf32_Phdr)];
//struct { U_Elf32_Ehdr ehdr; U_Elf32_Phdr phdr; } e; //struct { Elf32_Ehdr ehdr; Elf32_Phdr phdr; } e;
} u; } u;
COMPILE_TIME_ASSERT(sizeof(u.buf) <= 512); COMPILE_TIME_ASSERT(sizeof(u.buf) <= 512);
src/stdcxx.h
-4
View File
@@ -97,10 +97,6 @@ namespace std { class bad_alloc { }; }
#elif (ACC_CC_SYMANTECC) #elif (ACC_CC_SYMANTECC)
#define std #define std
class bad_alloc { }; class bad_alloc { };
#elif (ACC_CC_WATCOMC && (__WATCOMC__ >= 1280))
#elif (ACC_CC_WATCOMC)
#define std
class bad_alloc { };
#endif #endif