You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

113 lines
3.2 KiB

Index: src/X.c
--- src/X.c.orig 2005-01-18 08:12:16 +0100
+++ src/X.c 2005-07-25 19:53:26 +0200
@@ -24,6 +24,13 @@
#include "delegate.h"
#include "fpoll.h"
#include "proc.h"
+
+/* #undef CS unconditionally
+ * real problem exists under Solaris (10) that defines CS in
+ * /usr/include/sys/ucontext.h which is included together with stdlib.h
+ */
+#undef CS
+
void DBGMSG(PCStr(fmt),...);
static jmp_buf tel_env;
Index: src/dget.c
--- src/dget.c.orig 2005-03-14 03:29:45 +0100
+++ src/dget.c 2005-07-25 19:53:26 +0200
@@ -27,6 +27,12 @@
#include "file.h"
#include "auth.h"
+/* #undef ERR unconditionally
+ * real problem exists under Solaris (10) that defines ERR in
+ * /usr/include/sys/regset.h which is included together with stdlib.h
+ */
+#undef ERR
+
const char *strid_find(int tab,int hx,int id);
int connect2server(Connection *Conn,PCStr(proto),PCStr(host),int port);
Index: src/ftp.c
--- src/ftp.c.orig 2005-03-14 10:21:33 +0100
+++ src/ftp.c 2005-07-25 19:53:26 +0200
@@ -33,6 +33,12 @@
#include "auth.h"
#include "proc.h"
+/* #undef FS unconditionally
+ * real problem exists under Solaris (10) that defines FS in
+ * /usr/include/sys/ucontext.h which is included together with stdlib.h
+ */
+#undef FS
+
int connect_ftp_data(Connection*Conn,PCStr(port),int cntrlsock,PCStr(lhost),int lport);
void putFileInHTTP(FILE *tc,PCStr(path),PCStr(file));
FILE *dirtar_fopen(PCStr(path));
Index: src/smtpgate.c
--- src/smtpgate.c.orig 2005-02-28 23:38:56 +0100
+++ src/smtpgate.c 2005-07-25 19:53:26 +0200
@@ -49,6 +49,12 @@
#include "file.h"
#include "auth.h"
+/* #undef FS unconditionally
+ * real problem exists under Solaris (10) that defines FS in
+ * /usr/include/sys/ucontext.h which is included together with stdlib.h
+ */
+#undef FS
+
#define LNSIZE 1024
#define lfprintf SMTP_lfprintf
void SMTP_lfprintf(FILE *log,FILE *tosc,PCStr(fmt),...);
Index: src/telnet.c
--- src/telnet.c.orig 2005-03-01 00:25:53 +0100
+++ src/telnet.c 2005-07-25 19:53:26 +0200
@@ -28,6 +28,12 @@
#include "auth.h"
#include "proc.h"
+/* #undef CS unconditionally
+ * real problem exists under Solaris (10) that defines CS in
+ * /usr/include/sys/ucontext.h which is included together with stdlib.h
+ */
+#undef CS
+
extern int IO_TIMEOUT;
int makeXproxy(Connection *Conn,PVStr(pxdisplay),PCStr(display),PVStr(pxhost),PCStr(relhost),PCStr(me),int timeo);
Index: src/urlfind.c
--- src/urlfind.c.orig 2005-02-27 01:05:45 +0100
+++ src/urlfind.c 2005-07-25 19:53:26 +0200
@@ -25,6 +25,12 @@
#include "ystring.h"
#include "dglib.h"
+/* #undef ERR unconditionally
+ * real problem exists under Solaris (10) that defines ERR in
+ * /usr/include/sys/regset.h which is included together with stdlib.h
+ */
+#undef ERR
+
static const char *usage = "\
Usage: urlfind URL\n\
-- Find recursively in URL space.\n\
Index: teleport/vehicle.c
--- teleport/vehicle.c.orig 2005-03-01 00:44:54 +0100
+++ teleport/vehicle.c 2005-07-25 19:53:26 +0200
@@ -21,6 +21,12 @@
#include <stdio.h>
#include "teleport.h"
+/* #undef ERR unconditionally
+ * real problem exists under Solaris (10) that defines ERR in
+ * /usr/include/sys/regset.h which is included together with stdlib.h
+ */
+#undef ERR
+
#define TP_INVITE "INVITE"
#define TP_ROUTE "ROUTE"
#define IMSIZE (1024*8)