Fix build with newer pth, which defines read and write as macros.

4 files changed, 62 insertions, 1 deletions

diff --git a/inputmethod/unicon-im/distinfo b/inputmethod/unicon-im/distinfo
index e21dc73beec..54602f9a321 100644
--- a/inputmethod/unicon-im/distinfo
+++ b/inputmethod/unicon-im/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2006/01/15 14:05:44 rxg Exp $
+$NetBSD: distinfo,v 1.6 2007/03/24 16:04:56 joerg Exp $
 
 SHA1 (unicon-1.2.tar.gz) = 61854d160547f645f8033f0b4fd15ebb15ab92a8
 RMD160 (unicon-1.2.tar.gz) = c862f03ba561fe4c3641cf8b364a9bae40a78c03
@@ -12,3 +12,5 @@ SHA1 (patch-af) = d4d729c75c1f3f9ea02b3cc5087069732df5f0a9
 SHA1 (patch-ag) = 7955678370e49317b8e9244616fd49f65667d167
 SHA1 (patch-ah) = 1e9413af0b2904cb17a028d5cedfd1ded6eca22b
 SHA1 (patch-ai) = de5452fea6a9183cc008fd0b8f37b00e7f4a066c
+SHA1 (patch-aj) = 13592873c58a68837fd9a62052640121452dd343
+SHA1 (patch-ak) = e73ed21080cf92db41038acec7ea3f574b3bad59
diff --git a/inputmethod/unicon-im/patches/patch-aj b/inputmethod/unicon-im/patches/patch-aj
new file mode 100644
index 00000000000..29a4799458c
--- /dev/null
+++ b/inputmethod/unicon-im/patches/patch-aj
@@ -0,0 +1,22 @@
+$NetBSD: patch-aj,v 1.1 2007/03/24 16:04:56 joerg Exp $
+
+--- server/TLS_PthSocket.cpp.orig	2000-05-12 06:53:46.000000000 +0000
++++ server/TLS_PthSocket.cpp
+@@ -58,7 +58,7 @@ int TLS_CPthSocket::PollWrite (char *buf
+     return b;
+ }
+ 
+-int TLS_CPthSocket::read (void *buf, int buflen)
++int TLS_CPthSocket::socket_read (void *buf, int buflen)
+ {
+     short len;
+ #ifdef __IMM_DEBUG__
+@@ -77,7 +77,7 @@ int TLS_CPthSocket::read (void *buf, int
+     return len;
+ }
+ 
+-int TLS_CPthSocket::write (void *buf, int len)
++int TLS_CPthSocket::socket_write (void *buf, int len)
+ {
+     short len0 = len;
+ #ifdef __IMM_DEBUG__
diff --git a/inputmethod/unicon-im/patches/patch-ak b/inputmethod/unicon-im/patches/patch-ak
new file mode 100644
index 00000000000..1fa216394eb
--- /dev/null
+++ b/inputmethod/unicon-im/patches/patch-ak
@@ -0,0 +1,15 @@
+$NetBSD: patch-ak,v 1.1 2007/03/24 16:04:56 joerg Exp $
+
+--- server/TLS_PthSocket.hpp.orig	2007-03-24 15:47:15.000000000 +0000
++++ server/TLS_PthSocket.hpp
+@@ -11,8 +11,8 @@ private:
+ public:
+     TLS_CPthSocket (int fd);
+     ~TLS_CPthSocket ();
+-    int read (void *buf, int len);
+-    int write (void *buf, int len);
++    int socket_read (void *buf, int len);
++    int socket_write (void *buf, int len);
+ };
+ 
+ #endif
diff --git a/inputmethod/unicon-im/patches/patck-al b/inputmethod/unicon-im/patches/patck-al
new file mode 100644
index 00000000000..ccc03d2af5f
--- /dev/null
+++ b/inputmethod/unicon-im/patches/patck-al
@@ -0,0 +1,22 @@
+$NetBSD: patck-al,v 1.1 2007/03/24 16:04:56 joerg Exp $
+
+--- server/TLS_TcpipMain.cpp.orig	2000-06-14 04:00:01.000000000 +0000
++++ server/TLS_TcpipMain.cpp
+@@ -91,7 +91,7 @@ static void *handler(void *_arg)
+     printf ("========== Begin New Client Socket =========== \n");
+     /* read request */
+     while (bExit == 0) {
+-        n = MyTLS_CPthSocket.read (caLine, MAXREQLINE);
++        n = MyTLS_CPthSocket.socket_read (caLine, MAXREQLINE);
+         if (n < 0) {
+             fprintf(stderr, "read error: errno=%d\n", errno);
+             close(fd);
+@@ -237,7 +237,7 @@ static void *handler(void *_arg)
+         }
+         /* simulate a little bit of processing ;) */
+         pth_yield (NULL);
+-        n = MyTLS_CPthSocket.write (MemOut->pGetBuf (), MemOut->GetBufLen());
++        n = MyTLS_CPthSocket.socket_write (MemOut->pGetBuf (), MemOut->GetBufLen());
+         //pth_write(fd, MemOut->pGetBuf (), MemOut->GetBufLen());
+     }
+     /* close connection and let thread die */