delegate.patch 3.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126
  1. Index: maker/__forkpty.c
  2. --- maker/__forkpty.c.orig 2005-07-30 09:42:26 +0200
  3. +++ maker/__forkpty.c 2006-06-10 22:56:33 +0200
  4. @@ -6,8 +6,12 @@
  5. #include <sys/types.h>
  6. #include <sys/ioctl.h>
  7. #include <termios.h>
  8. +#if defined(__NetBSD__)
  9. +#include <util.h>
  10. +#else
  11. #include <libutil.h>
  12. #endif
  13. +#endif
  14. int Forkpty(int *pty,char *name){
  15. int pid;
  16. Index: src/Makefile
  17. --- src/Makefile.orig 2006-05-06 10:57:09 +0200
  18. +++ src/Makefile 2006-06-10 22:56:33 +0200
  19. @@ -248,7 +248,7 @@
  20. SUBIN = subin
  21. #endif #############
  22. #ifdef UNIX,OS2EMX ################################################
  23. -CFLAGSPLUS = if(UNIX,OS2EMX) -x c++ -DQS
  24. +CFLAGSPLUS = if(UNIX,OS2EMX)
  25. COPY = cp -p
  26. CFLAGS = if(UNIX,OS2EMX) -O
  27. CCINX = .c
  28. Index: src/X.c
  29. --- src/X.c.orig 2005-06-08 04:54:43 +0200
  30. +++ src/X.c 2006-06-10 22:56:33 +0200
  31. @@ -24,6 +24,13 @@
  32. #include "delegate.h"
  33. #include "fpoll.h"
  34. #include "proc.h"
  35. +
  36. +/* #undef CS unconditionally
  37. + * real problem exists under Solaris (10) that defines CS in
  38. + * /usr/include/sys/ucontext.h which is included together with stdlib.h
  39. + */
  40. +#undef CS
  41. +
  42. void DBGMSG(PCStr(fmt),...);
  43. static jmp_buf tel_env;
  44. Index: src/dget.c
  45. --- src/dget.c.orig 2006-06-01 21:34:16 +0200
  46. +++ src/dget.c 2006-06-10 22:56:33 +0200
  47. @@ -32,6 +32,12 @@
  48. const char *DELEGATE_getEnv(PCStr(name));
  49. +/* #undef ERR unconditionally
  50. + * real problem exists under Solaris (10) that defines ERR in
  51. + * /usr/include/sys/regset.h which is included together with stdlib.h
  52. + */
  53. +#undef ERR
  54. +
  55. const char *strid_find(int tab,int hx,int id);
  56. int connect2server(Connection *Conn,PCStr(proto),PCStr(host),int port);
  57. Index: src/smtpgate.c
  58. --- src/smtpgate.c.orig 2006-05-04 23:37:38 +0200
  59. +++ src/smtpgate.c 2006-06-10 22:56:33 +0200
  60. @@ -49,6 +49,12 @@
  61. #include "file.h"
  62. #include "auth.h"
  63. +/* #undef FS unconditionally
  64. + * real problem exists under Solaris (10) that defines FS in
  65. + * /usr/include/sys/ucontext.h which is included together with stdlib.h
  66. + */
  67. +#undef FS
  68. +
  69. #define LNSIZE 1024
  70. #define lfprintf SMTP_lfprintf
  71. void SMTP_lfprintf(FILE *log,FILE *tosc,PCStr(fmt),...);
  72. Index: src/telnet.c
  73. --- src/telnet.c.orig 2006-03-16 09:03:23 +0100
  74. +++ src/telnet.c 2006-06-10 22:56:33 +0200
  75. @@ -28,6 +28,12 @@
  76. #include "auth.h"
  77. #include "proc.h"
  78. +/* #undef CS unconditionally
  79. + * real problem exists under Solaris (10) that defines CS in
  80. + * /usr/include/sys/ucontext.h which is included together with stdlib.h
  81. + */
  82. +#undef CS
  83. +
  84. extern int IO_TIMEOUT;
  85. int makeXproxy(Connection *Conn,PVStr(pxdisplay),PCStr(display),PVStr(pxhost),PCStr(relhost),PCStr(me),int timeo);
  86. Index: src/urlfind.c
  87. --- src/urlfind.c.orig 2006-03-16 09:07:57 +0100
  88. +++ src/urlfind.c 2006-06-10 22:56:33 +0200
  89. @@ -25,6 +25,12 @@
  90. #include "ystring.h"
  91. #include "dglib.h"
  92. +/* #undef ERR unconditionally
  93. + * real problem exists under Solaris (10) that defines ERR in
  94. + * /usr/include/sys/regset.h which is included together with stdlib.h
  95. + */
  96. +#undef ERR
  97. +
  98. static const char *usage = "\
  99. Usage: urlfind URL\n\
  100. -- Find recursively in URL space.\n\
  101. Index: teleport/vehicle.c
  102. --- teleport/vehicle.c.orig 2006-02-08 11:25:36 +0100
  103. +++ teleport/vehicle.c 2006-06-10 22:56:33 +0200
  104. @@ -21,6 +21,12 @@
  105. #include <stdio.h>
  106. #include "teleport.h"
  107. +/* #undef ERR unconditionally
  108. + * real problem exists under Solaris (10) that defines ERR in
  109. + * /usr/include/sys/regset.h which is included together with stdlib.h
  110. + */
  111. +#undef ERR
  112. +
  113. #define TP_INVITE "INVITE"
  114. #define TP_ROUTE "ROUTE"
  115. #define IMSIZE (1024*8)