delegate.patch 3.1 KB

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