X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lib-src%2Fgnuserv.h;h=d9298c8f8968deb9b8620d2ee31e3f0463407910;hb=21139873a3d4f0e532097d6a1d6169bc0b7769e5;hp=4e2ac5a9aad72a61e2ee1355b571e9e9283deaad;hpb=81572e9b4653c5545c2eb43e87dec439f356c19c;p=chise%2Fxemacs-chise.git-

diff --git a/lib-src/gnuserv.h b/lib-src/gnuserv.h
index 4e2ac5a..d9298c8 100644
--- a/lib-src/gnuserv.h
+++ b/lib-src/gnuserv.h
@@ -36,18 +36,13 @@ static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup a
 
 #define USE_TMPDIR
 
-#define NO_SHORTNAMES
-
 #define PATCHLEVEL 2
 
 #define NO_SHORTNAMES
 /* gnuserv should not be compiled using SOCKS */
 #define DO_NOT_SOCKSIFY
+#define DONT_ENCAPSULATE
 #include <config.h>
-#undef read
-#undef write
-#undef open
-#undef close
 #undef signal
 
 /* Define the communication method between server and clients:
@@ -174,7 +169,7 @@ static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup a
  */
 #ifndef DONT_USE_LITOUT
 #if !defined(HAVE_TERMIO) && !defined(HAVE_TERMIOS) && !defined(VMS)
-#if !defined(MSDOS) && !defined(BSD4_1)
+#if !defined(BSD4_1)
 #define USE_LITOUT
 #endif
 #endif
@@ -216,7 +211,7 @@ int make_connection (char *hostarg, int portarg, int *s);
 void disconnect_from_ipc_server();
 #endif
 #if defined(INTERNET_DOMAIN_SOCKETS) || defined(UNIX_DOMAIN_SOCKETS)
-void send_string (int s, CONST char *msg);
+void send_string (int s, const char *msg);
 void disconnect_from_server (int s, int echo);
 int read_line (int s, char *dest);
 #endif