diff -urNp httrack-3.42.1.orig/src/htscore.h httrack-3.42.1/src/htscore.h
--- httrack-3.42.1.orig/src/htscore.h 2006-08-15 18:32:08.000000000 +0530
+++ httrack-3.42.1/src/htscore.h 2007-11-22 01:37:11.000000000 +0530
@@ -43,24 +43,10 @@ Please visit our Website: http://www.htt
/* specific definitions */
#include "htsbase.h"
// Includes & définitions
-#if ( defined(_WIN32) ||defined(HAVE_SYS_TYPES_H) )
#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
-#endif
-#ifdef _WIN32
-#ifndef _WIN32_WCE
-#include <conio.h>
-#endif
-#ifndef _WIN32_WCE
-#include <direct.h>
-#endif
-#else
-#ifdef HAVE_UNISTD_H
#include <unistd.h>
-#endif
-#endif
+
/* END specific definitions */
/* Forward definitions */
diff -urNp httrack-3.42.1.orig/src/htsnet.h httrack-3.42.1/src/htsnet.h
--- httrack-3.42.1.orig/src/htsnet.h 2007-02-03 19:05:56.000000000 +0530
+++ httrack-3.42.1/src/htsnet.h 2007-11-22 01:44:05.000000000 +0530
@@ -44,37 +44,23 @@ Please visit our Website: http://www.htt
#include "htsbasenet.h"
#include <ctype.h>
-#ifdef _WIN32
- // pour read
-#ifndef _WIN32_WCE
- #include <io.h>
-#endif
- // pour FindFirstFile
- #include <winbase.h>
-#else
//typedef int T_SOC;
- #define INVALID_SOCKET -1
- #include <netdb.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <sys/time.h>
+#define INVALID_SOCKET -1
+#include <netdb.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <sys/time.h>
/* Force for sun env. */
- #ifndef BSD_COMP
- #define BSD_COMP
- #endif
- #include <sys/ioctl.h>
- /* gethostname & co */
-#ifdef HAVE_UNISTD_H
- #include <unistd.h>
+#ifndef BSD_COMP
+# define BSD_COMP
#endif
+#include <sys/ioctl.h>
+ /* gethostname & co */
+#include <unistd.h>
/* inet_addr */
- #include <arpa/inet.h>
+#include <arpa/inet.h>
// pas la peine normalement..
-#ifndef HTS_DO_NOT_REDEFINE_in_addr_t
- typedef unsigned long in_addr_t;
-#endif
-#endif
/*
** ipV4 **
diff -urNp httrack-3.42.1.orig/src/htsserver.h httrack-3.42.1/src/htsserver.h
--- httrack-3.42.1.orig/src/htsserver.h 2006-10-15 14:09:54.000000000 +0530
+++ httrack-3.42.1/src/htsserver.h 2007-11-22 08:37:55.000000000 +0530
@@ -39,12 +39,15 @@ Please visit our Website: http://www.htt
#ifndef HTS_SERVER_DEFH
#define HTS_SERVER_DEFH
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
#include "htsnet.h"
/* String */
#include "htsstrings.h"
-
// Fonctions
void socinput(T_SOC soc,char* s,int max);
T_SOC smallserver_init_std(int* port_prox,char* adr_prox,int defaultPort);