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.

107 lines
3.4 KiB

  1. diff -rupN seafile-server-4.1.2.orig/lib/net.c seafile-server-4.1.2/lib/net.c
  2. --- seafile-server-4.1.2.orig/lib/net.c 2015-09-09 19:31:56.000000000 +0200
  3. +++ seafile-server-4.1.2/lib/net.c 2015-09-14 20:20:30.906021296 +0200
  4. @@ -31,11 +31,7 @@
  5. #include <fcntl.h>
  6. -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
  7. #include <event2/util.h>
  8. -#else
  9. -#include <evutil.h>
  10. -#endif
  11. #include "net.h"
  12. diff -rupN seafile-server-4.1.2.orig/lib/net.h seafile-server-4.1.2/lib/net.h
  13. --- seafile-server-4.1.2.orig/lib/net.h 2015-09-09 19:31:56.000000000 +0200
  14. +++ seafile-server-4.1.2/lib/net.h 2015-09-14 20:20:30.906021296 +0200
  15. @@ -19,11 +19,7 @@
  16. #include <netinet/tcp.h>
  17. #endif
  18. -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
  19. #include <event2/util.h>
  20. -#else
  21. -#include <evutil.h>
  22. -#endif
  23. #ifdef WIN32
  24. #define ECONNREFUSED WSAECONNREFUSED
  25. diff -rupN seafile-server-4.1.2.orig/lib/utils.h seafile-server-4.1.2/lib/utils.h
  26. --- seafile-server-4.1.2.orig/lib/utils.h 2015-09-09 19:31:56.000000000 +0200
  27. +++ seafile-server-4.1.2/lib/utils.h 2015-09-14 20:20:30.907021326 +0200
  28. @@ -13,11 +13,7 @@
  29. #include <stdlib.h>
  30. #include <sys/stat.h>
  31. -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
  32. #include <event2/util.h>
  33. -#else
  34. -#include <evutil.h>
  35. -#endif
  36. #ifdef __linux__
  37. #include <endian.h>
  38. diff -rupN seafile-server-4.1.2.orig/server/access-file.c seafile-server-4.1.2/server/access-file.c
  39. --- seafile-server-4.1.2.orig/server/access-file.c 2015-09-09 19:31:56.000000000 +0200
  40. +++ seafile-server-4.1.2/server/access-file.c 2015-09-14 20:20:30.907021326 +0200
  41. @@ -3,13 +3,9 @@
  42. #define DEBUG_FLAG SEAFILE_DEBUG_HTTP
  43. #include "log.h"
  44. -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
  45. #include <event2/event.h>
  46. #include <event2/bufferevent.h>
  47. #include <event2/bufferevent_struct.h>
  48. -#else
  49. -#include <event.h>
  50. -#endif
  51. #include <evhtp.h>
  52. diff -rupN seafile-server-4.1.2.orig/server/http-server.c seafile-server-4.1.2/server/http-server.c
  53. --- seafile-server-4.1.2.orig/server/http-server.c 2015-09-09 19:31:56.000000000 +0200
  54. +++ seafile-server-4.1.2/server/http-server.c 2015-09-14 20:20:30.908021355 +0200
  55. @@ -6,11 +6,7 @@
  56. #include <locale.h>
  57. #include <sys/types.h>
  58. -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
  59. #include <event2/event.h>
  60. -#else
  61. -#include <event.h>
  62. -#endif
  63. #include <evhtp.h>
  64. diff -rupN seafile-server-4.1.2.orig/server/listen-mgr.c seafile-server-4.1.2/server/listen-mgr.c
  65. --- seafile-server-4.1.2.orig/server/listen-mgr.c 2015-09-09 19:31:56.000000000 +0200
  66. +++ seafile-server-4.1.2/server/listen-mgr.c 2015-09-14 20:23:15.614452334 +0200
  67. @@ -3,11 +3,9 @@
  68. #include <event2/event.h>
  69. #include <event2/listener.h>
  70. -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
  71. #include <event2/bufferevent.h>
  72. #include <event2/buffer_compat.h>
  73. #include <event2/bufferevent_struct.h>
  74. -#endif
  75. #include "seafile-session.h"
  76. diff -rupN seafile-server-4.1.2.orig/server/upload-file.c seafile-server-4.1.2/server/upload-file.c
  77. --- seafile-server-4.1.2.orig/server/upload-file.c 2015-09-09 19:31:56.000000000 +0200
  78. +++ seafile-server-4.1.2/server/upload-file.c 2015-09-14 20:20:30.909021385 +0200
  79. @@ -6,11 +6,7 @@
  80. #include <getopt.h>
  81. #include <fcntl.h>
  82. -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
  83. #include <event2/event.h>
  84. -#else
  85. -#include <event.h>
  86. -#endif
  87. #include <evhtp.h>