From 7d2da48ddbf76a4f778dee5191c0a1c0fe53dc5f Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Mon, 24 Sep 2012 17:07:49 -0700 Subject: [PATCH] Remove config_unix.h since the things it was working around were fixed years ago --- aegisub/src/agi_pre.h | 1 + aegisub/src/config.h | 3 --- aegisub/src/config/config_unix.h | 27 --------------------------- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 aegisub/src/config/config_unix.h diff --git a/aegisub/src/agi_pre.h b/aegisub/src/agi_pre.h index 5a50cbae2..c3963fc94 100644 --- a/aegisub/src/agi_pre.h +++ b/aegisub/src/agi_pre.h @@ -179,6 +179,7 @@ #include #include #include +#include #include #include #include diff --git a/aegisub/src/config.h b/aegisub/src/config.h index d5fa31958..6a606921c 100644 --- a/aegisub/src/config.h +++ b/aegisub/src/config.h @@ -18,9 +18,6 @@ // Generated by configure.in #include "../acconf.h" -// Unix specific settings and defines. -#include "config/config_unix.h" - #endif // __WINDOWS__ #endif // AGI_PRE diff --git a/aegisub/src/config/config_unix.h b/aegisub/src/config/config_unix.h deleted file mode 100644 index 228ba20fb..000000000 --- a/aegisub/src/config/config_unix.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#ifndef _DEFINES_H -#define _DEFINES_H - -#define __AVISYNTH_H__ -#define WX_PRECOMP - -#include "acconf.h" - -#ifdef HAVE_STDINT_H -#define __STDC_CONSTANT_MACROS 1 -#include -#endif -#ifdef HAVE_INTTYPES_H -#include -#endif - -// These shouldn't be needed any longer, if there are -// any occurrences of __int64 replace them with long long. -//typedef int64_t __int64; -//typedef uint64_t __uint64; -#define abs64 llabs - -#endif /* _DEFINES_H */ - -