* src/lha.h, src/header.c: CoreFoundation header inclusion moved to

header.c.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/lha/lha/trunk@332 6a8cc165-1e22-0410-a132-eb4e3f353aba

diff --git a/src/header.c b/src/header.c
index f392bfe..479029e 100644 (file)
--- a/src/header.c
+++ b/src/header.c
@@ -1124,6 +1124,10 @@ write_header(nafp, hdr)
 }
 
 #ifdef __APPLE__
+
+#include <CoreFoundation/CFString.h>
+#include <CoreFoundation/CFStringEncodingExt.h>
+
 /* this is not need for Mac OS X v 10.2 later */
 enum {
   kCFStringEncodingAllowLossyConversion = 1,

diff --git a/src/lha.h b/src/lha.h
index 1b53131..56ae58c 100644 (file)
--- a/src/lha.h
+++ b/src/lha.h
@@ -116,11 +116,6 @@ typedef int gid_t;
 # endif
 #endif
 
-#ifdef __APPLE__  /* On MacOS X, use CoreFoundation for utf8 conversion */
-#include <CoreFoundation/CFString.h>
-#include <CoreFoundation/CFStringEncodingExt.h>
-#endif /* __APPLE__ */
-
 #ifndef SEEK_SET
 #define SEEK_SET               0
 #define SEEK_CUR               1