Remove unnecessary cruft, make it compatible with gcc only and remove __GNU_C__ defin...

diff --git a/7z/Portable.h b/7z/Portable.h
index 1d5788ec5288e3b21fc28a73c8f1f220c048daaf..f07f3f74c717db31076184c159b112aaa29a1285 100644 (file)
--- a/7z/Portable.h
+++ b/7z/Portable.h
@@ -2,17 +2,8 @@
 #define __PORTABLE_H
 
 #include <string.h>
-#ifndef __GNU_C__ // MSVC
-typedef __int16 INT16;
-typedef unsigned __int16 UINT16;
-typedef __int32 INT32;
-typedef unsigned __int32 UINT32;
-typedef __int64 INT64;
-typedef unsigned __int64 UINT64;
-typedef ptrdiff_t UINT_PTR;
-typedef __int32 INT;
-#else // gcc
 #include <stdint.h>
+
 typedef int16_t INT16;
 typedef uint16_t UINT16;
 typedef int32_t INT32;
@@ -21,7 +12,6 @@ typedef int64_t INT64;
 typedef uint64_t UINT64;
 typedef uintptr_t UINT_PTR;
 typedef int32_t INT;
-#endif
 
 typedef signed char INT8;
 typedef unsigned char UINT8;

diff --git a/general.h b/general.h
index 95ac3e21d927dc4727f106e5c108d716119b8e01..198195df237701ea662771653680790cea610a87 100644 (file)
--- a/general.h
+++ b/general.h
@@ -4,6 +4,7 @@
 \r
 //#define DISABLE_RLZ\r
 \r
+#include <stdint.h>\r
 \r
 #define APPNAME "Rcomage"\r
 #define APPNAME_VER "Rcomage v1.1.1"\r
@@ -47,36 +48,19 @@ extern Bool quietMode;
 #define ALIGN_TO_4(n) (((n) + 3) & (~3))\r
 //#define ALIGN_TO_4(n) (((n) + 3) >>2 <<2) // problem: upper 2 bits gets wiped too\r
 \r
-#ifndef __GNU_C__\r
-typedef unsigned __int8 uint8;\r
-typedef __int8 int8;\r
-typedef unsigned __int16 uint16;\r
-typedef __int16 int16;\r
-typedef unsigned __int32 uint32;\r
-typedef __int32 int32;\r
-#else\r
-#include <stdint.h>\r
 typedef uint8_t uint8;\r
 typedef int8_t int8;\r
 typedef uint16_t uint16;\r
 typedef int16_t int16;\r
 typedef uint32_t uint32;\r
 typedef int32_t int32;\r
-#endif\r
-\r
 \r
 const uint32 UTF8_BOM = 0xBFBBEF;\r
 const uint16 UTF16_BOM = 0xFEFF;\r
 const uint32 UTF32_BOM = 0x0000FEFF;\r
 \r
 \r
-#ifndef __GNU_C__ /* msvc */\r
-#define PACK_STRUCT(nam, struc) typedef struct struc nam\r
-// need to use pragma directives whenever we use it...\r
-#else /* gcc */\r
 #define PACK_STRUCT(nam, struc) typedef struct struc __attribute__ ((packed)) nam\r
-#endif\r
-\r
 \r
 \r
 uint zlib_compress(void* src, uint srcLen, void* dest, uint destLen, int level, int strat);\r
@@ -92,14 +76,6 @@ Bool is_prime(uint in);
 \r
 void get_temp_fname(char* out, const char* ext);\r
 \r
-/*\r
-#ifndef Z_OK\r
-#define Z_OK 0\r
-#endif\r
-#ifndef Z_DATA_ERROR\r
-#define Z_DATA_ERROR -3\r
-#endif\r
-*/\r
 #define Z_USE_7Z 10\r
 \r
 #ifdef WIN32\r

diff --git a/rcofile.h b/rcofile.h
index eb39ba202cdcce490e09ae3feddd31eb27caac06..fb9b97f534ccd3e48e6bcfe5ae057b5f87cfa2f3 100644 (file)
--- a/rcofile.h
+++ b/rcofile.h
@@ -4,13 +4,6 @@
 \r
 #include "general.h"\r
 \r
-\r
-#ifndef __GNU_C__\r
-#pragma pack(push, 4)\r
-#pragma pack(1)\r
-#endif\r
-\r
-\r
 #define RCO_NULL_PTR 0xFFFFFFFF\r
 \r
 #define RCO_TABLE_MAIN 1\r
@@ -259,9 +252,6 @@ PACK_STRUCT(TextComprInfo, {
        uint32 unpackedLen;\r
 });\r
 \r
-#ifndef __GNU_C__\r
-#pragma pack(pop)\r
-#endif\r
 \r
 \r
 #endif\r

diff --git a/rcomain.h b/rcomain.h
index af1133786b801796bf5e585f89c9c6851b94cc58..2743069884e7b5f1c2455fe4f0765a0725fca16f 100644 (file)
--- a/rcomain.h
+++ b/rcomain.h
@@ -235,22 +235,6 @@ void es_extraObjAnim(Bool isObj, int type, void* data, Bool isPS3);
 \r
 \r
 \r
-\r
-\r
-\r
-\r
-\r
-\r
-\r
-\r
-\r
-\r
-#ifndef __GNU_C__\r
-#pragma pack(push, 4)\r
-#pragma pack(1)\r
-#endif\r
-\r
-\r
 PACK_STRUCT(RCOObjPos, {\r
        float posX;\r
        float posY;\r
@@ -601,10 +585,5 @@ PACK_STRUCT(RCOAnimSSlideout, {
 });\r
 */\r
 \r
-#ifndef __GNU_C__\r
-#pragma pack(pop)\r
-#endif\r
-\r
-\r
 \r
 #endif\r

diff --git a/rlzpack.c b/rlzpack.c
index 0b27bf83adb596e0b98b2a2c9fa772f800a6eb87..d4284394bf9f0010ff9751c9e212abb1b156acd9 100644 (file)
--- a/rlzpack.c
+++ b/rlzpack.c
@@ -3,12 +3,7 @@
 #include <stdlib.h>\r
 #include <math.h>\r
 #include <stdio.h>\r
-\r
-#ifndef __GNU_C__ // MSVC\r
-typedef __int64 int64_t;\r
-#else\r
 #include <stdint.h>\r
-#endif\r
 \r
 #define RLZI_WINDOW_SIZE       0x7FED          // *4 = 130,996 bytes (128KB - 76 bytes)\r
 #define RLZI_DICTIONARY_SIZE   0x3FFFF         // *4 = 1,048,572 bytes (1MB - 4 bytes)\r

diff --git a/vaghandler.c b/vaghandler.c
index 47b3376e6ecef6536b6ca048b9c4b19ad1d749a3..fd73d59bc2d3f9fddc34d11f4a09e4743b96f867 100644 (file)
--- a/vaghandler.c
+++ b/vaghandler.c
@@ -19,10 +19,6 @@ const double f[5][2] = { { 0.0, 0.0 },
 \r
 #define ROUND(x) ((int)(x<0 ? x-0.5 : x+0.5))\r
 \r
-#ifndef __GNU_C__\r
-#pragma pack(push, 4)\r
-#pragma pack(1)\r
-#endif\r
 \r
 #define VAG_SIGNATURE 0x70474156\r
 #define VAG_VERSION 0x4000000 //0x2000000\r
@@ -64,9 +60,6 @@ PACK_STRUCT(WavHeader, {
        uint32 s2sig;           // "data"\r
        uint32 s2size;          // = numSamples * channels * bitDepth/8  OR size-36\r
 });\r
-#ifndef __GNU_C__\r
-#pragma pack(pop)\r
-#endif\r
 \r
 \r
 // TODO: sanity checks with lengths\r

diff --git a/vsmx.h b/vsmx.h
index 37f789d9af10ca02c9cb8bfe96bc24df46e10b82..871501b8c1404b6073a73f99aa799218fef1d8c4 100644 (file)
--- a/vsmx.h
+++ b/vsmx.h
@@ -2,12 +2,6 @@
 #ifndef __VSMX_H__\r
 #define __VSMX_H__\r
 \r
-\r
-#ifndef __GNU_C__\r
-#pragma pack(push, 4)\r
-#pragma pack(1)\r
-#endif\r
-\r
 typedef wchar_t wchar;\r
 \r
 #define VSMX_SIGNATURE 0x584D5356 // "VSMX"\r
@@ -40,10 +34,6 @@ PACK_STRUCT(VSMXGroup, {
         } val;\r
 });\r
 \r
-#ifndef __GNU_C__\r
-#pragma pack(pop)\r
-#endif\r
-\r
 typedef struct {\r
        VSMXGroup* code;\r
        wchar *text, *prop;\r