OpenSDE Packages Database (without history before r20070)
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.

51 lines
1.8 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../pgbouncer/pgbouncer-sys_poll.h.patch
  5. # Copyright (C) 2013 - 2015 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  16. The standard is clearly defining that only <poll.h> needs to be included.
  17. http://pubs.opengroup.org/onlinepubs/000095399/basedefs/poll.h.html
  18. --- a/lib/m4/usual.m4 2013-08-09 15:16:56.716600440 +0200
  19. +++ b/lib/m4/usual.m4 2013-08-09 15:17:07.488877797 +0200
  20. @@ -181,7 +181,7 @@
  21. dnl
  22. AC_DEFUN([AC_USUAL_HEADER_CHECK], [
  23. AC_CHECK_HEADERS([inttypes.h stdbool.h unistd.h sys/time.h])
  24. -AC_CHECK_HEADERS([sys/socket.h poll.h sys/poll.h sys/un.h])
  25. +AC_CHECK_HEADERS([sys/socket.h poll.h sys/un.h])
  26. AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/tcp.h])
  27. AC_CHECK_HEADERS([sys/param.h sys/uio.h pwd.h grp.h])
  28. AC_CHECK_HEADERS([sys/wait.h sys/mman.h syslog.h netdb.h dlfcn.h])
  29. --- a/lib/usual/socket.h 2013-08-09 15:10:58.444331854 +0200
  30. +++ b/lib/usual/socket.h 2013-08-09 15:14:24.957124489 +0200
  31. @@ -22,7 +22,6 @@
  32. * - win32: <winsock2.h>
  33. * - win32: <ws2tcpip.h>
  34. * - <sys/socket.h>
  35. - * - <sys/poll.h>
  36. * - <sys/un.h>
  37. * - <netinet/in.h>
  38. * - <netinet/tcp.h>
  39. @@ -50,9 +49,6 @@
  40. #ifdef HAVE_POLL_H
  41. #include <poll.h>
  42. #endif
  43. -#ifdef HAVE_SYS_POLL_H
  44. -#include <sys/poll.h>
  45. -#endif
  46. #ifdef HAVE_SYS_UIO_H
  47. #include <sys/uio.h>
  48. #endif