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.
 
 
 
 
 
 

125 lines
3.4 KiB

Index: maker/__forkpty.c
--- maker/__forkpty.c.orig 2005-07-30 09:42:26 +0200
+++ maker/__forkpty.c 2006-06-10 22:56:33 +0200
@@ -6,8 +6,12 @@
#include <sys/types.h>
#include <sys/ioctl.h>
#include <termios.h>
+#if defined(__NetBSD__)
+#include <util.h>
+#else
#include <libutil.h>
#endif
+#endif
int Forkpty(int *pty,char *name){
int pid;
Index: src/Makefile
--- src/Makefile.orig 2006-11-29 17:57:54 +0100
+++ src/Makefile 2006-12-04 18:05:38 +0100
@@ -255,7 +255,7 @@
SUBIN = subin
#endif #############
#ifdef UNIX,OS2EMX ################################################
-CFLAGSPLUS = if(UNIX,OS2EMX) -x c++ -DQS
+CFLAGSPLUS = if(UNIX,OS2EMX)
DGEXE = ./dg.exe
COPY = cp -f -p
CFLAGS = if(UNIX,OS2EMX) -O
Index: src/X.c
--- src/X.c.orig 2005-06-08 04:54:43 +0200
+++ src/X.c 2006-06-10 22:56:33 +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 2006-06-01 21:34:16 +0200
+++ src/dget.c 2006-06-10 22:56:33 +0200
@@ -32,6 +32,12 @@
const char *DELEGATE_getEnv(PCStr(name));
+/* #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/smtpgate.c
--- src/smtpgate.c.orig 2006-05-04 23:37:38 +0200
+++ src/smtpgate.c 2006-06-10 22:56:33 +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 2006-03-16 09:03:23 +0100
+++ src/telnet.c 2006-06-10 22:56:33 +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 2006-03-16 09:07:57 +0100
+++ src/urlfind.c 2006-06-10 22:56:33 +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 2006-02-08 11:25:36 +0100
+++ teleport/vehicle.c 2006-06-10 22:56:33 +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)