[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Neon windows build

From: Branko Čibej <brane_at_xbc.nu>
Date: 2002-06-03 20:34:11 CEST

O.K., here's a recap. I have the following local changes to neon-0.21.0,
and Subversion now compiles cleanly (and seems to work, too):

diff -ru neon-0.21.0/neon.mak neon/neon.mak
--- neon-0.21.0/neon.mak 2002-02-25 21:54:01.000000000 +0100
+++ neon/neon.mak 2002-06-03 20:01:20.000000000 +0200
@@ -57,7 +57,6 @@
 LIB32=link.exe -lib
 LIB32_FLAGS=/nologo /out:"$(TARGET)"
 LIB32_OBJS= \
- "$(INTDIR)\base64.obj" \
        "$(INTDIR)\ne_xml.obj" \
        "$(INTDIR)\ne_acl.obj" \
        "$(INTDIR)\ne_alloc.obj" \
@@ -91,7 +90,6 @@
 ALL: ".\src\config.h" "$(TARGET)"

 CLEAN:
- -@erase "$(INTDIR)\base64.obj"
        -@erase "$(INTDIR)\ne_207.obj"
        -@erase "$(INTDIR)\ne_alloc.obj"
        -@erase "$(INTDIR)\ne_acl.obj"
@@ -135,7 +133,6 @@
   echo Created config.h from config.hw
 <<

-"$(INTDIR)\base64.obj": .\src\base64.c
 "$(INTDIR)\ne_207.obj": .\src\ne_207.c
 "$(INTDIR)\ne_alloc.obj": .\src\ne_alloc.c
 "$(INTDIR)\ne_acl.obj": .\src\ne_acl.c
diff -ru neon-0.21.0/src/ne_compress.c neon/src/ne_compress.c
--- neon-0.21.0/src/ne_compress.c 2002-05-19 16:38:15.000000000 +0200
+++ neon/src/ne_compress.c 2002-06-03 20:03:58.000000000 +0200
@@ -348,6 +348,7 @@
        free(ctx->enchdr);

     switch (ctx->state) {
+ case NE_Z_BEFORE_DATA:
     case NE_Z_PASSTHROUGH:
     case NE_Z_FINISHED:
        ret = NE_OK;
diff -ru neon-0.21.0/src/ne_socket.h neon/src/ne_socket.h
--- neon-0.21.0/src/ne_socket.h 2002-05-19 19:08:10.000000000 +0200
+++ neon/src/ne_socket.h 2002-06-03 20:02:38.000000000 +0200
@@ -41,6 +41,11 @@

 BEGIN_NEON_DECLS

+#if defined(WIN32) && !defined(ssize_t)
+/* some of the API uses ssize_t so we need to define it. */
+#define ssize_t int
+#endif
+
 #define NE_SOCK_ERROR -1
 /* Read/Write timed out */
 #define NE_SOCK_TIMEOUT -2
diff -ru neon-0.21.0/src/ne_utils.h neon/src/ne_utils.h
--- neon-0.21.0/src/ne_utils.h 2002-04-14 00:13:02.000000000 +0200
+++ neon/src/ne_utils.h 2002-06-03 20:02:04.000000000 +0200
@@ -65,11 +65,6 @@
 #define min(a,b) ((a)<(b)?(a):(b))
 #endif

-#ifdef WIN32
-/* some of the API uses ssize_t so we need to define it. */
-#define ssize_t int
-#endif
-
 /* CONSIDER: mutt has a nicer way of way of doing debugging output... maybe
  * switch to like that. */

I haven't tested with a mod-deflate-enabled sercer, though.

-- 
Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jun 3 20:34:49 2002

This is an archived mail posted to the Subversion Dev mailing list.