From 0cb0dbf6d86916c29cb7ed2eada6d9040363eceb Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Thu, 5 Jan 2023 14:26:12 +0100
Subject: [PATCH] src: cleanup conf.h

---
 src/conf.h   | 80 ++++++++++++++++++++++++----------------------------
 src/main.cpp |  4 +++
 2 files changed, 41 insertions(+), 43 deletions(-)

diff --git a/src/conf.h b/src/conf.h
index 4fe9188f..4f66049a 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -44,11 +44,9 @@
 #  endif
 #endif
 
-#undef NDEBUG
-
 
 /*************************************************************************
-// ACC
+// ACC and system includes
 **************************************************************************/
 
 #ifndef ACC_CFG_USE_NEW_STYLE_CASTS
@@ -117,19 +115,29 @@ ACC_COMPILE_TIME_ASSERT_HEADER((char)(-1) == 255) // -funsigned-char
 #  include <intrin.h>
 #endif
 
-/* intergral types */
-typedef acc_int8_t      upx_int8_t;
-typedef acc_uint8_t     upx_uint8_t;
-typedef acc_int16_t     upx_int16_t;
-typedef acc_uint16_t    upx_uint16_t;
-typedef acc_int32_t     upx_int32_t;
-typedef acc_uint32_t    upx_uint32_t;
-typedef acc_int64_t     upx_int64_t;
-typedef acc_uint64_t    upx_uint64_t;
-typedef acc_uintptr_t   upx_uintptr_t;
+// C++ headers
+#include <exception>
+#include <new>
+#include <type_traits>
+#include <typeinfo>
+#if __STDC_NO_ATOMICS__ || 1
+// UPX currently does not use multithreading
+#define upx_std_atomic(Type)    Type
+//#define upx_std_atomic(Type)    typename std::add_volatile<Type>::type
+#else
+#include <atomic>
+#define upx_std_atomic(Type)    std::atomic<Type>
+#endif
+//#define DOCTEST_CONFIG_DISABLE 1
+#include <doctest/doctest/parts/doctest_fwd.h>
+#if WITH_BOOST_PFR
+#include <sstream>
+#include <boost/pfr/io.hpp>
+#endif
 
-typedef unsigned char   upx_byte;
-#define upx_bytep       upx_byte *
+// IMPORTANT: unconditionally enable assertions
+#undef NDEBUG
+#include <assert.h>
 
 
 /*************************************************************************
@@ -180,9 +188,19 @@ typedef unsigned char   upx_byte;
 #  define VALGRIND_MAKE_MEM_UNDEFINED(addr,len) 0
 #endif
 
-// IMPORTANT: unconditionally enable assertions
-#undef NDEBUG
-#include <assert.h>
+// intergral types
+typedef acc_int8_t      upx_int8_t;
+typedef acc_uint8_t     upx_uint8_t;
+typedef acc_int16_t     upx_int16_t;
+typedef acc_uint16_t    upx_uint16_t;
+typedef acc_int32_t     upx_int32_t;
+typedef acc_uint32_t    upx_uint32_t;
+typedef acc_int64_t     upx_int64_t;
+typedef acc_uint64_t    upx_uint64_t;
+typedef acc_uintptr_t   upx_uintptr_t;
+
+typedef unsigned char   upx_byte;
+#define upx_bytep       upx_byte *
 
 // protect against integer overflows and malicious header fields
 // see C 11 standard, Annex K
@@ -284,10 +302,6 @@ typedef upx_int64_t upx_off_t;
 #  define O_BINARY  0
 #endif
 
-#ifndef OPTIONS_VAR
-#  define OPTIONS_VAR   "UPX"
-#endif
-
 
 /*************************************************************************
 //
@@ -340,7 +354,7 @@ inline void NO_fprintf(FILE *, const char *, ...) {}
 #define __packed_struct_end()   };
 
 #if (ACC_ARCH_M68K && ACC_OS_TOS && ACC_CC_GNUC) && defined(__MINT__)
-// hack for broken compiler
+// horrible hack for broken compiler
 #define upx_alignas_1       __attribute__((__aligned__(1),__packed__))
 #define upx_alignas_16      __attribute__((__aligned__(2))) // object file maximum 2 ???
 #define upx_alignas__(a)    upx_alignas_ ## a
@@ -743,22 +757,6 @@ struct upx_compress_result_t
 // globals
 **************************************************************************/
 
-#include <exception>
-#include <new>
-#include <type_traits>
-#include <typeinfo>
-#if __STDC_NO_ATOMICS__ || 1
-// UPX currently does not use multithreading
-#define upx_std_atomic(Type)    Type
-//#define upx_std_atomic(Type)    typename std::add_volatile<Type>::type
-#else
-#include <atomic>
-#define upx_std_atomic(Type)    std::atomic<Type>
-#endif
-#if WITH_BOOST_PFR
-#include <sstream>
-#endif
-
 #include "util/snprintf.h"   // must get included first!
 #include "options.h"
 #include "except.h"
@@ -841,11 +839,7 @@ int upx_test_overlap       ( const upx_bytep buf,
 //
 **************************************************************************/
 
-//#define DOCTEST_CONFIG_DISABLE 1
-#include <doctest/doctest/parts/doctest_fwd.h>
-
 #if WITH_BOOST_PFR
-#include <boost/pfr/io.hpp>
 template <class A>
 __acc_noinline std::string pfr_string(const A &a) {
     std::ostringstream ss;
diff --git a/src/main.cpp b/src/main.cpp
index 5d8cd474..6c0ccf6b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -35,6 +35,10 @@
 // options
 **************************************************************************/
 
+#ifndef OPTIONS_VAR
+#define OPTIONS_VAR "UPX"
+#endif
+
 static const char *argv0 = "";
 const char *progname = "";