mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

Updated.

Browse Source 
committer: mfx <mfx> 1042742278 +0000
This commit is contained in:
Markus F.X.J. Oberhumer 2003-01-16 18:37:58 +00:00
parent 8f25c72085
commit f92b617c43
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile
View File

@ -233,6 +233,7 @@ CXX = icc
CCARCH += -march=i386 -mcpu=i686
CFLAGS_OUTPUT = -o $@
LINK_EXE_OUTPUT = -o $@
LDLIBS += -lz
DEFS += '-DUPX_CONFIG_H="config_h/linux.h"'
CFLAGS = $(CFLAGS_WERROR)

10
src/stdcxx.h
View File

@ -51,8 +51,6 @@
# if 1
# define DISABLE_NEW_DELETE_PLACEMENT_NEW \
static void *operator new(size_t, void *);
# else
# define DISABLE_NEW_DELETE_PLACEMENT_NEW
# endif
# if defined(__GNUC__) && (__GNUC__ >= 3)
# define DISABLE_NEW_DELETE_PLACEMENT_DELETE \
@ -63,7 +61,13 @@
# elif defined(_MSC_VER) && (_MSC_VER >= 1200)
# define DISABLE_NEW_DELETE_PLACEMENT_DELETE \
static void operator delete(void *, void *) NOTHROW { }
# else
# endif
# if !defined(DISABLE_NEW_DELETE_PLACEMENT_NEW)
# define DISABLE_NEW_DELETE_PLACEMENT_NEW
# undef DISABLE_NEW_DELETE_PLACEMENT_DELETE
# endif
# if !defined(DISABLE_NEW_DELETE_PLACEMENT_DELETE)
# define DISABLE_NEW_DELETE_PLACEMENT_DELETE
# endif