diff -u -r -N C:\Downloads\curl-7.12.1_orig/include/curl/curl.h e:\projects\curl-7.12.1/include/curl/curl.h --- C:\Downloads\curl-7.12.1_orig/include/curl/curl.h 2004-06-22 22:39:50.000000000 -0700 +++ e:\projects\curl-7.12.1/include/curl/curl.h 2004-10-25 23:58:57.421875000 -0700 @@ -52,9 +52,14 @@ * platforms. We also provide a CURL_FORMAT_OFF_T define to use in *printf * format strings when outputting a variable of type curl_off_t. */ + #if defined(_MSC_VER) || defined(__LCC__) /* MSVC */ +#ifdef _WIN32_WCE + typedef long curl_off_t; +#else typedef signed __int64 curl_off_t; +#endif #define CURL_FORMAT_OFF_T "%I64d" #else /* _MSC_VER || __LCC__ */ #if (defined(__GNUC__) && defined(WIN32)) || defined(__WATCOMC__) diff -u -r -N C:\Downloads\curl-7.12.1_orig/include/curl/multi.h e:\projects\curl-7.12.1/include/curl/multi.h --- C:\Downloads\curl-7.12.1_orig/include/curl/multi.h 2004-03-24 22:53:42.000000000 -0800 +++ e:\projects\curl-7.12.1/include/curl/multi.h 2004-09-21 22:04:38.609375000 -0700 @@ -51,7 +51,7 @@ #define WIN32 1 #endif -#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) +#if HAVE_WINSOCK2_H #include #else diff -u -r -N C:\Downloads\curl-7.12.1_orig/include/WinCEDummyFiles/sys/socket.h e:\projects\curl-7.12.1/include/WinCEDummyFiles/sys/socket.h --- C:\Downloads\curl-7.12.1_orig/include/WinCEDummyFiles/sys/socket.h 1969-12-31 16:00:00.000000000 -0800 +++ e:\projects\curl-7.12.1/include/WinCEDummyFiles/sys/socket.h 2004-04-26 22:38:40.000000000 -0700 @@ -0,0 +1 @@ +/* not used */ diff -u -r -N C:\Downloads\curl-7.12.1_orig/include/WinCEDummyFiles/sys/stat.h e:\projects\curl-7.12.1/include/WinCEDummyFiles/sys/stat.h --- C:\Downloads\curl-7.12.1_orig/include/WinCEDummyFiles/sys/stat.h 1969-12-31 16:00:00.000000000 -0800 +++ e:\projects\curl-7.12.1/include/WinCEDummyFiles/sys/stat.h 2004-04-26 22:38:40.000000000 -0700 @@ -0,0 +1 @@ +/* not used */ diff -u -r -N C:\Downloads\curl-7.12.1_orig/include/WinCEDummyFiles/sys/types.h e:\projects\curl-7.12.1/include/WinCEDummyFiles/sys/types.h --- C:\Downloads\curl-7.12.1_orig/include/WinCEDummyFiles/sys/types.h 1969-12-31 16:00:00.000000000 -0800 +++ e:\projects\curl-7.12.1/include/WinCEDummyFiles/sys/types.h 2004-04-26 22:38:40.000000000 -0700 @@ -0,0 +1 @@ +/* not used */ diff -u -r -N C:\Downloads\curl-7.12.1_orig/lib/config-win32ce.h e:\projects\curl-7.12.1/lib/config-win32ce.h --- C:\Downloads\curl-7.12.1_orig/lib/config-win32ce.h 1969-12-31 16:00:00.000000000 -0800 +++ e:\projects\curl-7.12.1/lib/config-win32ce.h 2004-10-28 01:07:35.906250000 -0700 @@ -0,0 +1,257 @@ +/* config.h. Generated automatically by configure. */ +/* config.h.in. Generated automatically from configure.in by autoheader. */ + +#ifndef __CONFIG_WIN32_H +#define __CONFIG_WIN32_H + +/* Define if on AIX 3. + System headers sometimes define this. + We just want to avoid a redefinition error message. */ +#ifndef _ALL_SOURCE +/* #undef _ALL_SOURCE */ +#endif + +/* Define to empty if the keyword does not work. */ +/* #undef const */ + +/* Define if you don't have vprintf but do have _doprnt. */ +/* #undef HAVE_DOPRNT */ + +/* Define if you have the vprintf function. */ +#define HAVE_VPRINTF 1 + +/* Define as the return type of signal handlers (int or void). */ +/*#define RETSIGTYPE void */ + +/* Define to `unsigned' if doesn't define. */ +/* #undef size_t */ + +/* Define this to 'int' if ssize_t is not an available typedefed type */ +#define ssize_t int + +/* Define this to 'int' if socklen_t is not an available typedefed type */ +#if !defined(ENABLE_IPV6) && ((_MSC_VER < 1300) || !defined(USE_SSLEAY)) +#define socklen_t int +#endif + +/* The size of a `curl_off_t', as computed by sizeof. */ +#ifdef SIZEOF_CURL_OFF_T +#undef SIZEOF_CURL_OFF_T +#endif + +/* Borland lacks _lseeki64(), so we don't support >2GB files */ +#define SIZEOF_CURL_OFF_T 4 + +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define if you can safely include both and . */ +/* #define TIME_WITH_SYS_TIME 1 */ + +/* Define cpu-machine-OS */ +#define OS "i386-pc-win32" + +/* The number of bytes in a long double. */ +#define SIZEOF_LONG_DOUBLE 16 + +/* The number of bytes in a long long. */ +/* #define SIZEOF_LONG_LONG 8 */ + +/* Define if you have the gethostbyaddr function. */ +#define HAVE_GETHOSTBYADDR 1 + +/* Define if you have the gethostname function. */ +#define HAVE_GETHOSTNAME 1 + +/* Define if you have the getpass function. */ +/*#define HAVE_GETPASS 1*/ + +/* Define if you have the getservbyname function. */ +#define HAVE_GETSERVBYNAME 1 + +/* Define if you have the gettimeofday function. */ +/* #define HAVE_GETTIMEOFDAY 1 */ + +/* Define if you have the inet_addr function. */ +#define HAVE_INET_ADDR 1 + +/* Define if you have the inet_ntoa function. */ +#define HAVE_INET_NTOA 1 + +/* Define if you have the perror function. */ +#define HAVE_PERROR 1 + +/* Define if you have the select function. */ +#define HAVE_SELECT 1 + +/* Define if you have the socket function. */ +#define HAVE_SOCKET 1 + +/* Define if you have the strcasecmp function. */ +/*#define HAVE_STRCASECMP 1*/ + +/* Define if you have the stricmp function. */ +//#define HAVE_STRICMP 1 + +/* Define if you have the strdup function. */ +//#define HAVE_STRDUP 1 + +/* Define if you have the strftime function. */ +//#define HAVE_STRFTIME 1 + +/* Define if you have the strstr function. */ +#define HAVE_STRSTR 1 + +/* Define if you have the strtoll function. */ +#ifdef MINGW32 +#define HAVE_STRTOLL 1 +#endif + +/* Define if you have the tcgetattr function. */ +/*#define HAVE_TCGETATTR 1*/ + +/* Define if you have the tcsetattr function. */ +/*#define HAVE_TCSETATTR 1*/ + +/* Define if you have the uname function. */ +/*#define HAVE_UNAME 1*/ + +/* Define if you have utime() */ +#define HAVE_UTIME 1 + +/* Define if you have the header file. */ +/*#define HAVE_ALLOCA_H 1*/ + +/* Define if you have the malloc.h file. */ +#define HAVE_MALLOC_H 1 + +/* Define if you have the header file. */ +/* #define HAVE_ARPA_INET_H 1 */ + +/* Define if you have the header file. */ +//#define HAVE_ASSERT_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_CRYPTO_H */ + +/* Define if you have the header file. */ +/*#define HAVE_DLFCN_H 1*/ + +/* Define if you have the header file. */ +/* #undef HAVE_ERR_H */ + +/* Define if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_GETOPT_H */ + +/* Define if you have the header file. */ +/* #define HAVE_NETDB_H 1 */ + +/* Define if you have the header file. */ +/*#define HAVE_NETINET_IN_H 1*/ + +/* Define if you have the header file. */ +/*#define HAVE_SGTTY_H 1*/ + +/* Define if you have the header file. */ +/* #undef HAVE_SSL_H */ + +/* Define if you have the header file. */ +/*#define HAVE_SYS_PARAM_H 1*/ + +/* Define if you have the header file. */ +/* #define HAVE_SYS_SELECT_H 1 */ + +/* Define if you have the header file. */ +/*#define HAVE_SYS_SOCKET_H 1*/ + +/* Define if you have the header file. */ +/* #define HAVE_SYS_SOCKIO_H 1 */ + +/* Define if you have the header file. */ +//#define HAVE_SYS_STAT_H 1 + +/* Define if you have the header file */ +#define HAVE_SYS_UTIME_H 1 + +/* Define if you have the header file. */ +//#define HAVE_SYS_TYPES_H 1 + +/* Define if you have the header file. */ +/* #define HAVE_TERMIO_H 1 */ + +/* Define if you have the header file. */ +/* #define HAVE_TERMIOS_H 1 */ + +/* Name of package */ +#define PACKAGE "curl" + +/* Define if you have the header file. */ +#define HAVE_IO_H 1 + +/* Define if you have the header file. */ +#define HAVE_TIME_H 1 + +/* Define if you have the header file. */ +#define HAVE_WINSOCK_H 1 + +/* Define if you have the header file. */ +//#define HAVE_WINSOCK2_H 1 + +/* Define if you have the header file. */ +//#define HAVE_WS2TCPIP_H 1 + +/* Define if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define if you have the closesocket function. */ +#define HAVE_CLOSESOCKET 1 + +/* Define if you have the setvbuf function. */ +#define HAVE_SETVBUF 1 + +/* Define if you have the RAND_screen function when using SSL */ +#define HAVE_RAND_SCREEN 1 + +/* Define if you have the `RAND_status' function. */ +#define HAVE_RAND_STATUS 1 + +/* Define this to if in_addr_t is not an available typedefed type */ +#define in_addr_t unsigned long + +/* use ioctlsocket() for non-blocking sockets */ +#define HAVE_IOCTLSOCKET + +/************************************************* + * This section is for compiler specific defines.* + *************************************************/ +/* Borland and MS don't have this */ +#if defined(MINGW32) || defined(__WATCOMC__) || defined(__LCC__) + +/* Define if you have the header file. */ +#define HAVE_UNISTD_H 1 + +#else + +#endif + +// WinCE + +#define CURL_DISABLE_TELNET +#define CURL_DISABLE_LDAP +#define WITHOUT_MM_LIB + +#include +#include + +extern int errno; +#define strdup _strdup + +#define ENOSPC 1 +#define ENOMEM 2 + +extern int stat(const char *path,struct stat *buffer ); + +#endif diff -u -r -N C:\Downloads\curl-7.12.1_orig/lib/connect.c e:\projects\curl-7.12.1/lib/connect.c --- C:\Downloads\curl-7.12.1_orig/lib/connect.c 2004-08-04 14:45:50.000000000 -0700 +++ e:\projects\curl-7.12.1/lib/connect.c 2004-10-26 17:53:39.046875000 -0700 @@ -156,6 +156,7 @@ /* Windows? */ unsigned long flags; flags = nonblock; + return ioctlsocket(sockfd, FIONBIO, &flags); #define SETBLOCK 3 #endif @@ -405,13 +406,25 @@ * * Someone got to verify this on Win-NT 4.0, 2000." */ + +#ifdef _WIN32_WCE + Sleep(0); +#else SleepEx(0, FALSE); #endif +#endif + if( -1 == getsockopt(sockfd, SOL_SOCKET, SO_ERROR, (void *)&err, &errSize)) err = Curl_ourerrno(); +#ifdef _WIN32_WCE + // Always returns this error, bug in CE? + if(WSAENOPROTOOPT==err) + err=0; +#endif + if ((0 == err) || (EISCONN == err)) /* we are connected, awesome! */ rc = TRUE; diff -u -r -N C:\Downloads\curl-7.12.1_orig/lib/file.c e:\projects\curl-7.12.1/lib/file.c --- C:\Downloads\curl-7.12.1_orig/lib/file.c 2004-07-14 16:17:52.000000000 -0700 +++ e:\projects\curl-7.12.1/lib/file.c 2004-09-21 03:07:33.906250000 -0700 @@ -102,7 +102,7 @@ { char *real_path = curl_unescape(conn->path, 0); struct FILEPROTO *file; - int fd; + int fd=0; #if defined(WIN32) || defined(__EMX__) int i; char *actual_path; @@ -147,8 +147,9 @@ for (i=0; actual_path[i] != '\0'; ++i) if (actual_path[i] == '/') actual_path[i] = '\\'; - +#ifndef _WIN32_WCE fd = open(actual_path, O_RDONLY | O_BINARY); /* no CR/LF translation! */ +#endif file->path = actual_path; #else fd = open(real_path, O_RDONLY); @@ -273,6 +274,9 @@ are supported. This means that files on remotely mounted directories (via NFS, Samba, NT sharing) can be accessed through a file:// URL */ +#if _WIN32_WCE + return CURLE_FAILED_INIT; +#else CURLcode res = CURLE_OK; struct stat statbuf; curl_off_t expected_size=0; @@ -386,5 +390,6 @@ close(fd); return res; +#endif } #endif diff -u -r -N C:\Downloads\curl-7.12.1_orig/lib/ftp.c e:\projects\curl-7.12.1/lib/ftp.c --- C:\Downloads\curl-7.12.1_orig/lib/ftp.c 2004-08-10 10:44:14.000000000 -0700 +++ e:\projects\curl-7.12.1/lib/ftp.c 2004-10-27 17:59:40.937500000 -0700 @@ -472,7 +472,7 @@ char *buf = data->state.buffer; /* this is our buffer */ struct FTP *ftp; CURLcode result; - int ftpcode, try; + int ftpcode, trynum; ftp = (struct FTP *)malloc(sizeof(struct FTP)); if(!ftp) @@ -541,9 +541,9 @@ if(data->set.ftp_ssl && !conn->ssl[FIRSTSOCKET].use) { /* we don't have a SSL/TLS connection, try a FTPS connection now */ - for (try = 0; ftpauth[try]; try++) { + for (trynum = 0; ftpauth[trynum]; trynum++) { - FTPSENDF(conn, "AUTH %s", ftpauth[try]); + FTPSENDF(conn, "AUTH %s", ftpauth[trynum]); result = Curl_GetFTPResponse(&nread, conn, &ftpcode); @@ -814,8 +814,15 @@ #ifdef HAVE_KRB4 Curl_sec_fflush_fd(conn, conn->sock[SECONDARYSOCKET]); #endif + /* shut down the socket to inform the server we're done */ + +#ifdef _WIN32_WCE + shutdown(conn->sock[SECONDARYSOCKET],2); // SD_BOTH +#endif + sclose(conn->sock[SECONDARYSOCKET]); + conn->sock[SECONDARYSOCKET] = CURL_SOCKET_BAD; if(!ftp->no_transfer && !status) { diff -u -r -N C:\Downloads\curl-7.12.1_orig/lib/getenv.c e:\projects\curl-7.12.1/lib/getenv.c --- C:\Downloads\curl-7.12.1_orig/lib/getenv.c 2004-06-26 12:58:56.000000000 -0700 +++ e:\projects\curl-7.12.1/lib/getenv.c 2004-09-22 17:12:22.109375000 -0700 @@ -43,6 +43,9 @@ static char *GetEnv(const char *variable) { +#ifdef _WIN32_WCE + return NULL; +#else #ifdef WIN32 /* This shit requires windows.h (HUGE) to be included */ char env[MAX_PATH]; /* MAX_PATH is from windef.h */ @@ -62,6 +65,7 @@ #endif #endif return (env && env[0])?strdup(env):NULL; +#endif } char *curl_getenv(const char *v) diff -u -r -N C:\Downloads\curl-7.12.1_orig/lib/hostthre.c e:\projects\curl-7.12.1/lib/hostthre.c --- C:\Downloads\curl-7.12.1_orig/lib/hostthre.c 2004-06-26 12:58:56.000000000 -0700 +++ e:\projects\curl-7.12.1/lib/hostthre.c 2004-09-22 21:49:26.093750000 -0700 @@ -180,7 +180,9 @@ * hopefully make printouts synchronised. I'm not sure it works * with a static runtime lib (MSVC's libc.lib). */ +#ifndef _WIN32_WCE *stderr = *td->stderr_file; +#endif WSASetLastError (conn->async.status = NO_DATA); /* pending status */ he = gethostbyname (conn->async.hostname); @@ -291,8 +293,15 @@ td->dummy_sock = CURL_SOCKET_BAD; td->stderr_file = stderr; + +#ifdef _WIN32_WCE + td->thread_hnd=(HANDLE) CreateThread(NULL,0,(LPTHREAD_START_ROUTINE) THREAD_FUNC,conn,0,&td->thread_id); +#else + td->thread_hnd = (HANDLE) _beginthreadex(NULL, 0, THREAD_FUNC, conn, 0, &td->thread_id); +#endif + #ifdef CURLRES_IPV6 curlassert(hints); td->hints = *hints; diff -u -r -N C:\Downloads\curl-7.12.1_orig/lib/if2ip.c e:\projects\curl-7.12.1/lib/if2ip.c --- C:\Downloads\curl-7.12.1_orig/lib/if2ip.c 2004-07-04 11:35:50.000000000 -0700 +++ e:\projects\curl-7.12.1/lib/if2ip.c 2004-09-21 02:53:07.406250000 -0700 @@ -127,9 +127,9 @@ /* -- end of if2ip() -- */ #else -char *Curl_if2ip(const char *interface, char *buf, int buf_size) +char *Curl_if2ip(const char *interfaceisareservedkeyword, char *buf, int buf_size) { - (void) interface; + (void) interfaceisareservedkeyword; (void) buf; (void) buf_size; return NULL; diff -u -r -N C:\Downloads\curl-7.12.1_orig/lib/memory.h e:\projects\curl-7.12.1/lib/memory.h --- C:\Downloads\curl-7.12.1_orig/lib/memory.h 2004-06-26 12:58:58.000000000 -0700 +++ e:\projects\curl-7.12.1/lib/memory.h 2004-09-21 01:06:05.437500000 -0700 @@ -25,6 +25,7 @@ #include /* for the typedefs */ +#if 0 extern curl_malloc_callback Curl_cmalloc; extern curl_free_callback Curl_cfree; extern curl_realloc_callback Curl_crealloc; @@ -46,5 +47,5 @@ #define free(ptr) Curl_cfree(ptr) #endif - #endif /* _CURL_MEMORY_H */ +#endif diff -u -r -N C:\Downloads\curl-7.12.1_orig/lib/mprintf.c e:\projects\curl-7.12.1/lib/mprintf.c --- C:\Downloads\curl-7.12.1_orig/lib/mprintf.c 2004-06-26 12:58:58.000000000 -0700 +++ e:\projects\curl-7.12.1/lib/mprintf.c 2004-09-21 14:12:08.625000000 -0700 @@ -40,6 +40,12 @@ #include +#ifdef _WIN32_WCE +#define CURL_CDECL __cdecl +#else +#define CURL_CDECL +#endif + #ifndef SIZEOF_LONG_DOUBLE #define SIZEOF_LONG_DOUBLE 0 #endif @@ -583,7 +589,12 @@ void *data, /* untouched by format(), just sent to the stream() function in the second argument */ /* function pointer called for each output character */ + +#if _WIN32_WCE + int (__cdecl *stream) (int, FILE *), +#else int (*stream)(int, FILE *), +#endif const char *format, /* %-formatted string */ va_list ap_save) /* list of parameters */ { @@ -979,7 +990,7 @@ } /* fputc() look-alike */ -static int addbyter(int output, FILE *data) +static int CURL_CDECL addbyter(int output, FILE *data) { struct nsprintf *infop=(struct nsprintf *)data; unsigned char outc = (unsigned char)output; @@ -1027,7 +1038,7 @@ } /* fputc() look-alike */ -static int alloc_addbyter(int output, FILE *data) +static int CURL_CDECL alloc_addbyter(int output, FILE *data) { struct asprintf *infop=(struct asprintf *)data; unsigned char outc = (unsigned char)output; @@ -1113,7 +1124,7 @@ return strdup(""); } -static int storebuffer(int output, FILE *data) +static int CURL_CDECL storebuffer(int output, FILE *data) { char **buffer = (char **)data; unsigned char outc = (unsigned char)output; @@ -1142,6 +1153,7 @@ int retcode; va_list ap_save; /* argument pointer */ va_start(ap_save, format); + retcode = dprintf_formatf(stdout, fputc, format, ap_save); va_end(ap_save); return retcode; Files C:\Downloads\curl-7.12.1_orig/lib/Release/base64.obj and e:\projects\curl-7.12.1/lib/Release/base64.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/connect.obj and e:\projects\curl-7.12.1/lib/Release/connect.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/content_encoding.obj and e:\projects\curl-7.12.1/lib/Release/content_encoding.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/cookie.obj and e:\projects\curl-7.12.1/lib/Release/cookie.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/dict.obj and e:\projects\curl-7.12.1/lib/Release/dict.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/easy.obj and e:\projects\curl-7.12.1/lib/Release/easy.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/escape.obj and e:\projects\curl-7.12.1/lib/Release/escape.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/file.obj and e:\projects\curl-7.12.1/lib/Release/file.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/formdata.obj and e:\projects\curl-7.12.1/lib/Release/formdata.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/ftp.obj and e:\projects\curl-7.12.1/lib/Release/ftp.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/getdate.obj and e:\projects\curl-7.12.1/lib/Release/getdate.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/getenv.obj and e:\projects\curl-7.12.1/lib/Release/getenv.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/getinfo.obj and e:\projects\curl-7.12.1/lib/Release/getinfo.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/hash.obj and e:\projects\curl-7.12.1/lib/Release/hash.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/hostares.obj and e:\projects\curl-7.12.1/lib/Release/hostares.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/hostasyn.obj and e:\projects\curl-7.12.1/lib/Release/hostasyn.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/hostip.obj and e:\projects\curl-7.12.1/lib/Release/hostip.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/hostip4.obj and e:\projects\curl-7.12.1/lib/Release/hostip4.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/hostip6.obj and e:\projects\curl-7.12.1/lib/Release/hostip6.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/hostsyn.obj and e:\projects\curl-7.12.1/lib/Release/hostsyn.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/hostthre.obj and e:\projects\curl-7.12.1/lib/Release/hostthre.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/http.obj and e:\projects\curl-7.12.1/lib/Release/http.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/http_chunks.obj and e:\projects\curl-7.12.1/lib/Release/http_chunks.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/http_digest.obj and e:\projects\curl-7.12.1/lib/Release/http_digest.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/http_negotiate.obj and e:\projects\curl-7.12.1/lib/Release/http_negotiate.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/http_ntlm.obj and e:\projects\curl-7.12.1/lib/Release/http_ntlm.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/if2ip.obj and e:\projects\curl-7.12.1/lib/Release/if2ip.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/inet_ntop.obj and e:\projects\curl-7.12.1/lib/Release/inet_ntop.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/inet_pton.obj and e:\projects\curl-7.12.1/lib/Release/inet_pton.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/krb4.obj and e:\projects\curl-7.12.1/lib/Release/krb4.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/ldap.obj and e:\projects\curl-7.12.1/lib/Release/ldap.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/lib.lib and e:\projects\curl-7.12.1/lib/Release/lib.lib differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/lib.pch and e:\projects\curl-7.12.1/lib/Release/lib.pch differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/llist.obj and e:\projects\curl-7.12.1/lib/Release/llist.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/md5.obj and e:\projects\curl-7.12.1/lib/Release/md5.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/memdebug.obj and e:\projects\curl-7.12.1/lib/Release/memdebug.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/mprintf.obj and e:\projects\curl-7.12.1/lib/Release/mprintf.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/multi.obj and e:\projects\curl-7.12.1/lib/Release/multi.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/netrc.obj and e:\projects\curl-7.12.1/lib/Release/netrc.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/progress.obj and e:\projects\curl-7.12.1/lib/Release/progress.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/security.obj and e:\projects\curl-7.12.1/lib/Release/security.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/sendf.obj and e:\projects\curl-7.12.1/lib/Release/sendf.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/share.obj and e:\projects\curl-7.12.1/lib/Release/share.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/speedcheck.obj and e:\projects\curl-7.12.1/lib/Release/speedcheck.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/ssluse.obj and e:\projects\curl-7.12.1/lib/Release/ssluse.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/strequal.obj and e:\projects\curl-7.12.1/lib/Release/strequal.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/strerror.obj and e:\projects\curl-7.12.1/lib/Release/strerror.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/strtok.obj and e:\projects\curl-7.12.1/lib/Release/strtok.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/strtoofft.obj and e:\projects\curl-7.12.1/lib/Release/strtoofft.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/telnet.obj and e:\projects\curl-7.12.1/lib/Release/telnet.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/timeval.obj and e:\projects\curl-7.12.1/lib/Release/timeval.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/transfer.obj and e:\projects\curl-7.12.1/lib/Release/transfer.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/url.obj and e:\projects\curl-7.12.1/lib/Release/url.obj differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/vc60.idb and e:\projects\curl-7.12.1/lib/Release/vc60.idb differ Files C:\Downloads\curl-7.12.1_orig/lib/Release/version.obj and e:\projects\curl-7.12.1/lib/Release/version.obj differ diff -u -r -N C:\Downloads\curl-7.12.1_orig/lib/setup.h e:\projects\curl-7.12.1/lib/setup.h --- C:\Downloads\curl-7.12.1_orig/lib/setup.h 2004-07-04 23:42:34.000000000 -0700 +++ e:\projects\curl-7.12.1/lib/setup.h 2004-09-21 03:34:53.203125000 -0700 @@ -40,11 +40,15 @@ #ifdef HAVE_CONFIG_H #include "config.h" /* the configure script results */ #else +#ifdef _WIN32_WCE +#include "config-win32ce.h" +#else #ifdef WIN32 /* hand-modified win32 config.h! */ #include "config-win32.h" #endif #endif +#endif #ifdef macintosh /* hand-modified MacOS config.h! */ @@ -172,7 +176,9 @@ #define _WIN32_WINNT 0x0501 #endif +#if HAVE_WINSOCK2_H #include /* required by telnet.c */ +#endif #if defined(ENABLE_IPV6) || defined(USE_SSLEAY) #include diff -u -r -N C:\Downloads\curl-7.12.1_orig/lib/strerror.c e:\projects\curl-7.12.1/lib/strerror.c --- C:\Downloads\curl-7.12.1_orig/lib/strerror.c 2004-06-26 12:58:58.000000000 -0700 +++ e:\projects\curl-7.12.1/lib/strerror.c 2004-09-21 02:48:18.718750000 -0700 @@ -511,6 +511,11 @@ *buf = '\0'; #if defined(WIN32) && !defined(__CYGWIN__) + +#if _WIN32_WCE + buf[0]=0; // no strerror +#else + /* 'sys_nerr' is the maximum errno number, it is not widely portable */ if (err >= 0 && err < sys_nerr) strncpy(buf, strerror(err), max); @@ -520,6 +525,7 @@ LANG_NEUTRAL, buf, max, NULL)) snprintf(buf, max, "Unknown error %d (%#x)", err, err); } +#endif #else /* not native Windows coming up */ /* These should be atomic and hopefully thread-safe */ diff -u -r -N C:\Downloads\curl-7.12.1_orig/lib/urldata.h e:\projects\curl-7.12.1/lib/urldata.h --- C:\Downloads\curl-7.12.1_orig/lib/urldata.h 2004-07-04 23:36:14.000000000 -0700 +++ e:\projects\curl-7.12.1/lib/urldata.h 2004-09-21 01:28:08.000000000 -0700 @@ -151,7 +151,7 @@ char *egdsocket; /* path to file containing the EGD daemon socket */ char *cipher_list; /* list of ciphers to use */ long numsessions; /* SSL session id cache size */ - curl_ssl_ctx_callback fsslctx; /* function to initialize ssl ctx */ + struct curl_ssl_ctx_callback *fsslctx; /* function to initialize ssl ctx */ void *fsslctxp; /*parameter for call back */ };