[GNUnet-SVN] r441 - in Extractor/src: include main plugins

[grothoff]

Author: grothoff
Date: 2005-03-15 07:43:39 -0800 (Tue, 15 Mar 2005)
New Revision: 441

Modified:
   Extractor/src/include/platform.h
   Extractor/src/main/extract.c
   Extractor/src/main/extractor.c
   Extractor/src/plugins/convert.c
   Extractor/src/plugins/filenameextractor.c
   Extractor/src/plugins/tarextractor.c
Log:
fix

Modified: Extractor/src/include/platform.h
===================================================================
--- Extractor/src/include/platform.h    2005-03-15 13:35:52 UTC (rev 440)
+++ Extractor/src/include/platform.h    2005-03-15 15:43:39 UTC (rev 441)
@@ -51,12 +51,15 @@
  #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 '/'
  

Modified: Extractor/src/main/extract.c
===================================================================
--- Extractor/src/main/extract.c        2005-03-15 13:35:52 UTC (rev 440)
+++ Extractor/src/main/extract.c        2005-03-15 15:43:39 UTC (rev 441)
@@ -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
 

Modified: Extractor/src/main/extractor.c
===================================================================
--- Extractor/src/main/extractor.c      2005-03-15 13:35:52 UTC (rev 440)
+++ Extractor/src/main/extractor.c      2005-03-15 15:43:39 UTC (rev 441)
@@ -26,12 +26,8 @@
 #else
 #include <../../libltdl/ltdl.h>
 #endif
-#include <locale.h>
-#include <iconv.h>
-#ifndef MINGW
-#include <langinfo.h>
-#endif
 
+
 #define DEBUG 1
 
 /**

Modified: Extractor/src/plugins/convert.c
===================================================================
--- Extractor/src/plugins/convert.c     2005-03-15 13:35:52 UTC (rev 440)
+++ Extractor/src/plugins/convert.c     2005-03-15 15:43:39 UTC (rev 441)
@@ -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

Modified: Extractor/src/plugins/filenameextractor.c
===================================================================
--- Extractor/src/plugins/filenameextractor.c   2005-03-15 13:35:52 UTC (rev 
440)
+++ Extractor/src/plugins/filenameextractor.c   2005-03-15 15:43:39 UTC (rev 
441)
@@ -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 */

Modified: Extractor/src/plugins/tarextractor.c
===================================================================
--- Extractor/src/plugins/tarextractor.c        2005-03-15 13:35:52 UTC (rev 
440)
+++ Extractor/src/plugins/tarextractor.c        2005-03-15 15:43:39 UTC (rev 
441)
@@ -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!