libextractor

commit ed9cf9905be69d5f96f2ccefddf4e5d6de649639
parent c197f49268967501b71bbe41e9bfed7ed7021ca7
Author: Christian Grothoff <christian@grothoff.org>
Date:   Tue, 15 Mar 2005 15:43:39 +0000

fix

Diffstat:
M
src/include/platform.h
 | 
5
++++-
M
src/main/extract.c
 | 
6
------
M
src/main/extractor.c
 | 
6
+-----
M
src/plugins/convert.c
 | 
5
-----
M
src/plugins/filenameextractor.c
 | 
3
---
M
src/plugins/tarextractor.c
 | 
4
----

6 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/src/include/platform.h b/src/include/platform.h
@@ -51,11 +51,14 @@
  #include <sys/mman.h>
  #include <netinet/in.h>
  #include <arpa/inet.h>
+
 #else
  #include <winsock2.h>
  #include <pthread.h>
- #include <locale.h>
 #endif
+#include <locale.h>
+#include <iconv.h>
+
 
 #ifndef MINGW
  #define DIR_SEPARATOR '/'
diff --git a/src/main/extract.c b/src/main/extract.c
@@ -22,12 +22,6 @@
 #include "extractor.h"
 #include "getopt.h"
 
-#include <locale.h>
-#include <iconv.h>
-#ifndef MINGW
-#include <langinfo.h>
-#endif
-
 #define YES 1
 #define NO 0
 
diff --git a/src/main/extractor.c b/src/main/extractor.c
@@ -26,11 +26,7 @@
 #else
 #include <../../libltdl/ltdl.h>
 #endif
-#include <locale.h>
-#include <iconv.h>
-#ifndef MINGW
-#include <langinfo.h>
-#endif
+
 
 #define DEBUG 1
 
diff --git a/src/plugins/convert.c b/src/plugins/convert.c
@@ -22,11 +22,6 @@
 #include "extractor.h"
 #include "convert.h"
 
-#include <iconv.h>
-#ifndef MINGW
-#include <langinfo.h>
-#endif
-
 /**
  * Convert the len characters long character sequence
  * given in input that is in the given charset
diff --git a/src/plugins/filenameextractor.c b/src/plugins/filenameextractor.c
@@ -21,9 +21,6 @@
 #include "platform.h"
 #include "extractor.h"
 #include "convert.h"
-#ifndef MINGW
-#include <langinfo.h>
-#endif
 
 
 /* "extract" the 'filename' as a keyword */
diff --git a/src/plugins/tarextractor.c b/src/plugins/tarextractor.c
@@ -20,11 +20,7 @@
 
 #include "platform.h"
 #include "extractor.h"
-#include <time.h>
 #include <zlib.h>
-#ifndef MINGW
-  #include <langinfo.h>
-#endif
 
 /*
  * Note that this code is not complete!