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

Update conf.h.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer 2017-01-28 22:26:01 +01:00
parent 34c9cfb6b0
commit f502f41359
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile
View File

@ -53,7 +53,6 @@ endif
LIBS += -lucl -lz
# LZMA from https://github.com/upx/upx-lzma-sdk
include $(top_srcdir)/src/stub/src/c/Makevars.lzma
DEFS += -DWITH_LZMA=$(UPX_LZMA_VERSION)
CPPFLAGS += $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
ifeq ($(BUILD_TYPE_DEBUG),1)

24
src/conf.h
View File

@ -34,6 +34,7 @@
#if !defined(_FILE_OFFSET_BITS)
# define _FILE_OFFSET_BITS 64
#endif
#undef NDEBUG
/*************************************************************************
@ -78,7 +79,6 @@ ACC_COMPILE_TIME_ASSERT_HEADER((char)(-1) > 0) // -funsigned-char
# undef HAVE_UTIME
#endif
#define ACC_WANT_ACC_INCD_H 1
#define ACC_WANT_ACC_INCE_H 1
#define ACC_WANT_ACC_LIB_H 1
@ -118,29 +118,20 @@ typedef unsigned char upx_byte;
#undef _
#undef __
#undef ___
#undef NDEBUG
#undef dos
#undef linux
#undef small
#undef tos
#undef unix
#if defined(__DJGPP__)
# undef sopen
# undef __unix__
# undef __unix
#endif
#define WITH_LZMA 0x443
#define WITH_UCL 1
#define WITH_ZLIB 1
#if !defined(WITH_LZMA) || (WITH_LZMA+0 == 0)
# error "WITH_LZMA is missing"
#elif (WITH_LZMA != 0x443)
# error "invalid WITH_LZMA version"
#endif
#if defined(UPX_OFFICIAL_BUILD)
# if !(WITH_LZMA && WITH_NRV && WITH_UCL && WITH_ZLIB)
# error
# endif
#endif
#if (WITH_UCL)
# define ucl_compress_config_t REAL_ucl_compress_config_t
# include <ucl/uclconf.h>
@ -152,11 +143,6 @@ typedef unsigned char upx_byte;
# undef ucl_compress_config_p
#endif
/*************************************************************************
// system includes
**************************************************************************/
// malloc debuggers
#if (WITH_VALGRIND)
# include <valgrind/memcheck.h>
@ -171,7 +157,6 @@ typedef unsigned char upx_byte;
# define VALGRIND_MAKE_MEM_UNDEFINED(addr,len) 0
#endif
// IMPORTANT: unconditionally enable assertions
#undef NDEBUG
#include <assert.h>
@ -198,7 +183,6 @@ typedef size_t upx_rsize_t;
# define STDERR_FILENO (fileno(stderr))
#endif
#if !(HAVE_STRCASECMP) && (HAVE_STRICMP)
# define strcasecmp stricmp
#endif
@ -206,7 +190,6 @@ typedef size_t upx_rsize_t;
# define strncasecmp strnicmp
#endif
#if !defined(S_IWUSR) && defined(_S_IWUSR)
# define S_IWUSR _S_IWUSR
#elif !defined(S_IWUSR) && defined(_S_IWRITE)
@ -246,7 +229,6 @@ typedef size_t upx_rsize_t;
# endif
#endif
// avoid warnings about shadowing global functions
#undef index
#define basename upx_basename