X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lib-src%2Fgnuserv.h;h=6ee2f0bf446686832ba5e46da46e26d3d62009d9;hp=9fb3eddd4e8b4676d819321af8a0f50b26562b7e;hb=efdb31fd4c8db81d2414c32d491f1bf994263c74;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910

diff --git a/lib-src/gnuserv.h b/lib-src/gnuserv.h
index 9fb3edd..6ee2f0b 100644
--- a/lib-src/gnuserv.h
+++ b/lib-src/gnuserv.h
@@ -30,24 +30,20 @@
  * ../etc/gnuserv.README relative to the directory containing this file)
  */
 
-#if 0
-static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup alpha !";
-#endif
+#define GNUSERV_VERSION "3.12"
 
+/* Note: this setting can cause client-server connection failure if the
+ * value of TMPDIR is not shared by client and server at run-time.
+ */
 #define USE_TMPDIR
 
-#define NO_SHORTNAMES
-
 #define PATCHLEVEL 2
 
 #define NO_SHORTNAMES
 /* gnuserv should not be compiled using SOCKS */
 #define DO_NOT_SOCKSIFY
-#include <../src/config.h>
-#undef read
-#undef write
-#undef open
-#undef close
+#define DONT_ENCAPSULATE
+#include <config.h>
 #undef signal
 
 /* Define the communication method between server and clients:
@@ -174,7 +170,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 +212,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