diff options
author | Xavier Roche <xroche@users.noreply.github.com> | 2013-09-14 09:29:44 +0000 |
---|---|---|
committer | Xavier Roche <xroche@users.noreply.github.com> | 2013-09-14 09:29:44 +0000 |
commit | 011ba96d5326c78f124da0373a3d27eb1f674ff5 (patch) | |
tree | 251e209e0a82af209fdfe8791ef1a9d6a8d27124 | |
parent | d7cc6f5b55a0d005ffc669810f7671002c5d63dc (diff) |
Removed dead code (_WIN32_WCE)
-rw-r--r-- | src/htsalias.c | 2 | ||||
-rw-r--r-- | src/htsback.c | 2 | ||||
-rw-r--r-- | src/htsbase.h | 6 | ||||
-rw-r--r-- | src/htsbasenet.h | 5 | ||||
-rw-r--r-- | src/htscatchurl.c | 2 | ||||
-rw-r--r-- | src/htscore.c | 6 | ||||
-rw-r--r-- | src/htscore.h | 4 | ||||
-rw-r--r-- | src/htsftp.c | 2 | ||||
-rw-r--r-- | src/htsglobal.h | 46 | ||||
-rw-r--r-- | src/htsindex.c | 2 | ||||
-rw-r--r-- | src/htslib.c | 36 | ||||
-rw-r--r-- | src/htslib.h | 25 | ||||
-rw-r--r-- | src/htsnet.h | 2 | ||||
-rw-r--r-- | src/htsparse.c | 2 | ||||
-rw-r--r-- | src/htsthread.h | 5 | ||||
-rw-r--r-- | src/httrack.c | 2 | ||||
-rw-r--r-- | src/md5.h | 3 |
17 files changed, 0 insertions, 152 deletions
diff --git a/src/htsalias.c b/src/htsalias.c index e67ac1a..4a578fe 100644 --- a/src/htsalias.c +++ b/src/htsalias.c @@ -572,13 +572,11 @@ int optinclude_file(const char *name, int *argc, char **argv, char *x_argvblk, /* Get home directory, '.' if failed */ /* example: /home/smith */ char *hts_gethome(void) { -#ifndef _WIN32_WCE char *home = getenv("HOME"); if (home) return home; else -#endif return "."; } diff --git a/src/htsback.c b/src/htsback.c index 8284c94..e7d64e5 100644 --- a/src/htsback.c +++ b/src/htsback.c @@ -55,10 +55,8 @@ Please visit our Website: http://www.httrack.com #ifdef _WIN32 #ifndef __cplusplus // DOS -#ifndef _WIN32_WCE #include <process.h> /* _beginthread, _endthread */ #endif -#endif #else #endif diff --git a/src/htsbase.h b/src/htsbase.h index c7ffb99..01b4705 100644 --- a/src/htsbase.h +++ b/src/htsbase.h @@ -111,7 +111,6 @@ extern "C" { extern HTSEXT_API t_abortLog abortLog__; #define abortLog(a) abortLog__(a, __FILE__, __LINE__) #define _ , -#ifndef _WIN32_WCE #define abortLogFmt(a) do { \ FILE* fp = fopen("CRASH.TXT", "wb"); \ if (!fp) fp = fopen("/tmp/CRASH.TXT", "wb"); \ @@ -128,11 +127,6 @@ extern "C" { fclose(fp); \ } \ } while(0) -#else -#define abortLogFmt(a) do { \ - XCEShowMessageA("HTTrack " HTTRACK_VERSIONID " closed at '" __FILE__ "', line %d\r\nReason:\r\n%s\r\n", __LINE__, a); \ -} while(0) -#endif #define assertf(exp) do { \ if (! ( exp ) ) { \ diff --git a/src/htsbasenet.h b/src/htsbasenet.h index fbbe1db..db4773c 100644 --- a/src/htsbasenet.h +++ b/src/htsbasenet.h @@ -40,7 +40,6 @@ Please visit our Website: http://www.httrack.com #include <winsock2.h> #else -#ifndef _WIN32_WCE #undef HTS_USESCOPEID #define WIN32_LEAN_AND_MEAN // KB955045 (http://support.microsoft.com/kb/955045) @@ -52,10 +51,6 @@ Please visit our Website: http://www.httrack.com #include <Wspiapi.h> //#include <winsock2.h> //#include <tpipv6.h> -#else -#include <winsock2.h> -#include <socket.h> -#endif #endif diff --git a/src/htscatchurl.c b/src/htscatchurl.c index 364ec7e..fe46531 100644 --- a/src/htscatchurl.c +++ b/src/htscatchurl.c @@ -40,9 +40,7 @@ Please visit our Website: http://www.httrack.com #include "htsbase.h" #include "htsnet.h" #include "htslib.h" -#ifndef _WIN32_WCE #include <fcntl.h> -#endif #ifdef _WIN32 #else #include <arpa/inet.h> diff --git a/src/htscore.c b/src/htscore.c index f2a3585..d996ffe 100644 --- a/src/htscore.c +++ b/src/htscore.c @@ -33,9 +33,7 @@ Please visit our Website: http://www.httrack.com /* Internal engine bytecode */ #define HTS_INTERNAL_BYTECODE -#ifndef _WIN32_WCE #include <fcntl.h> -#endif #include <ctype.h> /* File defs */ @@ -3293,11 +3291,7 @@ int read_stdin(char *s, int max) { #ifdef _WIN32 int check_stdin(void) { -#ifndef _WIN32_WCE return (_kbhit()); -#else - return 0; -#endif } #else int check_flot(T_SOC s) { diff --git a/src/htscore.h b/src/htscore.h index eab6190..97069b8 100644 --- a/src/htscore.h +++ b/src/htscore.h @@ -42,12 +42,8 @@ Please visit our Website: http://www.httrack.com #include <sys/types.h> #include <sys/stat.h> #ifdef _WIN32 -#ifndef _WIN32_WCE #include <conio.h> -#endif -#ifndef _WIN32_WCE #include <direct.h> -#endif #else #ifndef _WIN32 #include <unistd.h> diff --git a/src/htsftp.c b/src/htsftp.c index 98b76d0..5c9c8a7 100644 --- a/src/htsftp.c +++ b/src/htsftp.c @@ -49,11 +49,9 @@ Please visit our Website: http://www.httrack.com #ifdef _WIN32 #ifndef __cplusplus // DOS -#ifndef _WIN32_WCE #include <process.h> /* _beginthread, _endthread */ #endif #endif -#endif // ftp mode passif // #if HTS_INET6==0 diff --git a/src/htsglobal.h b/src/htsglobal.h index 6c154fd..e84916f 100644 --- a/src/htsglobal.h +++ b/src/htsglobal.h @@ -42,18 +42,8 @@ Please visit our Website: http://www.httrack.com #define HTTRACK_LIB_VERSION "2.0" #ifndef HTS_NOINCLUDES -#ifndef _WIN32_WCE #include <stdio.h> #include <stdlib.h> -#else -#include <stdio.h> -#include <stdlib.h> -#ifdef HTS_CECOMPAT -#include "cecompat.h" -#else -#include "celib.h" -#endif -#endif #endif // Définition plate-forme @@ -70,9 +60,6 @@ Please visit our Website: http://www.httrack.com // config.h #ifdef _WIN32 -// WIN32 -#ifndef _WIN32_WCE - /* #define HAVE_SYS_STAT_H 1 #define HAVE_SYS_TYPES_H 1 @@ -91,39 +78,6 @@ Please visit our Website: http://www.httrack.com #else -// Win32CE -//#pragma runtime_checks( "s", restore ) -#define HTS_SPARE_MEMORY 1 -#define HTS_ALIGN 8 -#define BIGSTK static -#undef DLLIB // LoadLibrary(libssl) crashes -#define NOSTRDEBUG 1 -#undef HTS_MAKE_KEYWORD_INDEX -#ifdef HTS_CECOMPAT -#define HTS_DO_NOT_USE_FTIME 1 -/* -#undef HAVE_SYS_STAT_H -#undef HAVE_SYS_TYPES_H -*/ -#else -#undef HTS_DO_NOT_USE_FTIME -/* -#define HAVE_SYS_STAT_H 1 -#define HAVE_SYS_TYPES_H 1 -*/ -#endif - -#define HTS_DLOPEN 0 -#undef HTS_INET6 -#ifndef S_ISREG -#define S_ISREG(m) ((m) & _S_IFREG) - -#endif - -#endif - -#else - #include "config.h" #ifndef FTIME diff --git a/src/htsindex.c b/src/htsindex.c index 83e8f52..78d168e 100644 --- a/src/htsindex.c +++ b/src/htsindex.c @@ -119,14 +119,12 @@ int hts_primindex_words = 0; */ void index_init(const char *indexpath) { #if HTS_MAKE_KEYWORD_INDEX -#ifndef _WIN32_WCE /* remove(concat(indexpath,"index.txt")); */ hts_index_init = 1; hts_primindex_size = 0; hts_primindex_words = 0; fp_tmpproject = tmpfile(); #endif -#endif } /* diff --git a/src/htslib.c b/src/htslib.c index 26db5f7..d731d01 100644 --- a/src/htslib.c +++ b/src/htslib.c @@ -37,12 +37,6 @@ Please visit our Website: http://www.httrack.com #include "htscore.h" -#ifdef _WIN32_WCE -#ifndef HTS_CECOMPAT -#pragma comment(lib, "celib.lib") //link with celib -#endif -#endif - /* specific definitions */ #include "htsbase.h" #include "htsnet.h" @@ -56,9 +50,7 @@ Please visit our Website: http://www.httrack.com #include "htsencoding.h" #ifdef _WIN32 -#ifndef _WIN32_WCE #include <direct.h> -#endif #else #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -78,31 +70,17 @@ static long int timezone = 0; #endif #include <stdarg.h> -#ifndef _WIN32_WCE #include <sys/timeb.h> #include <fcntl.h> -#else -#ifndef HTS_CECOMPAT -#include <sys/timeb.h> -#endif -#endif /* _WIN32_WCE */ // pour utimbuf #ifdef _WIN32 -#ifndef _WIN32_WCE #include <sys/utime.h> #else -#ifndef HTS_CECOMPAT -#include <sys/utime.h> -#endif -#endif -#else #include <utime.h> #endif /* _WIN32 */ -#ifndef _WIN32_WCE #include <sys/stat.h> -#endif /* END specific definitions */ // Debugging @@ -612,10 +590,6 @@ char *antislash(char *catbuff, const char *s) { } #endif -#ifdef _WIN32_WCE -char cwd[MAX_PATH + 1] = ""; -#endif - // Initialize a htsblk structure void hts_init_htsblk(htsblk * r) { memset(r, 0, sizeof(htsblk)); // effacer @@ -5122,11 +5096,7 @@ static FILE *hts_dgb_(void) { if ((hts_dgb_init & 0x80) == 0) { hts_dgb_init_fp = stderr; } else { -#ifdef _WIN32_WCE - hts_dgb_init_fp = fopen("\\Temp\\hts-debug.txt", "wb"); -#else hts_dgb_init_fp = FOPEN("hts-debug.txt", "wb"); -#endif if (hts_dgb_init_fp != NULL) { fprintf(hts_dgb_init_fp, "* Creating file\r\n"); } @@ -5176,12 +5146,6 @@ HTSEXT_API int hts_init(void) { hts_debug_log_print("entering hts_init()"); /* debug */ -#ifdef _WIN32_WCE -#ifndef HTS_CECOMPAT - xceinit(L""); -#endif -#endif - /* Init threads (lazy init) */ htsthread_init(); diff --git a/src/htslib.h b/src/htslib.h index b74621d..52d63e1 100644 --- a/src/htslib.h +++ b/src/htslib.h @@ -688,31 +688,6 @@ HTS_STATIC int compare_mime(httrackp * opt, const char *mime, const char *file, #endif -#ifdef _WIN32_WCE_XXC -extern char cwd[MAX_PATH + 1]; -HTS_STATIC char *getcwd_ce(char *buffer, int maxlen) { - TCHAR fileUnc[MAX_PATH + 1]; - char *plast; - - if (cwd[0] == 0) { - GetModuleFileName(NULL, fileUnc, MAX_PATH); - WideCharToMultiByte(CP_ACP, 0, fileUnc, -1, cwd, MAX_PATH, NULL, NULL); - plast = strrchr(cwd, '\\'); - if (plast) - *plast = 0; - /* Special trick to keep start menu clean... */ - if (_stricmp(cwd, "\\windows\\start menu") == 0) - strcpy(cwd, "\\Apps"); - } - if (buffer) - strncpy(buffer, cwd, maxlen); - return cwd; -} - -#undef getcwd -#define getcwd getcwd_ce -#endif - /* dirent() compatibility */ #ifdef _WIN32 #define HTS_DIRENT_SIZE 256 diff --git a/src/htsnet.h b/src/htsnet.h index fdfa5bd..e9c0629 100644 --- a/src/htsnet.h +++ b/src/htsnet.h @@ -42,9 +42,7 @@ Please visit our Website: http://www.httrack.com #include <ctype.h> #ifdef _WIN32 // pour read -#ifndef _WIN32_WCE #include <io.h> -#endif // pour FindFirstFile #include <winbase.h> #else diff --git a/src/htsparse.c b/src/htsparse.c index d38a04b..da2b11b 100644 --- a/src/htsparse.c +++ b/src/htsparse.c @@ -35,9 +35,7 @@ Please visit our Website: http://www.httrack.com /* Internal engine bytecode */ #define HTS_INTERNAL_BYTECODE -#ifndef _WIN32_WCE #include <fcntl.h> -#endif #include <ctype.h> /* File defs */ diff --git a/src/htsthread.h b/src/htsthread.h index e866ec1..c367c81 100644 --- a/src/htsthread.h +++ b/src/htsthread.h @@ -39,11 +39,6 @@ Please visit our Website: http://www.httrack.com #endif #ifdef _WIN32 #include "windows.h" -#ifdef _WIN32_WCE -#ifndef HTS_CECOMPAT -#include "cethread.h" -#endif -#endif #endif #ifndef USE_BEGINTHREAD #error needs USE_BEGINTHREAD diff --git a/src/httrack.c b/src/httrack.c index 4832d77..f60b898 100644 --- a/src/httrack.c +++ b/src/httrack.c @@ -876,14 +876,12 @@ static void sig_leave(int code) { static void signal_handlers(void) { #ifdef _WIN32 -#ifndef _WIN32_WCE #if 0 /* BUG366763 */ signal(SIGINT, sig_ask); // ^C #else signal(SIGINT, sig_leave); // ^C #endif signal(SIGTERM, sig_finish); // kill <process> -#endif #else #if 0 /* BUG366763 */ signal(SIGHUP, sig_back); // close window @@ -21,9 +21,6 @@ struct MD5Context { unsigned char in[64]; uint32 buf[4]; uint32 bits[2]; -#ifdef _WIN32_WCE - uint32 pad[2]; -#endif int doByteReverse; }; |