0003-Fix-compilation-issue-with-missing-sys-sysmacros.h-i.patch 2.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081
  1. From d934b0fa5ce24a8fd1987b916e435ba991c2ef64 Mon Sep 17 00:00:00 2001
  2. From: Vadim Kochan <vadim.kochan@petcube.com>
  3. Date: Mon, 31 Dec 2018 11:00:46 +0200
  4. Subject: [PATCH] Fix compilation issue due to missing sys/sysmacros.h include
  5. glibc 2.28+ no longer include <sys/sysmacros.h> from <sys/types.h>, so
  6. <sys/sysmacros.h> must now be explicitly included to use the major,
  7. minor and makedev macros.
  8. Signed-off-by: Vadim Kochan <vadim.kochan@petcube.com>
  9. ---
  10. src/daemon.c | 1 +
  11. src/device.c | 1 +
  12. src/mount-monitor.c | 1 +
  13. tools/udisks.c | 1 +
  14. tools/umount-udisks.c | 1 +
  15. 5 files changed, 5 insertions(+)
  16. diff --git a/src/daemon.c b/src/daemon.c
  17. index fafcf9a..4303a6d 100644
  18. --- a/src/daemon.c
  19. +++ b/src/daemon.c
  20. @@ -45,6 +45,7 @@
  21. #include <sys/socket.h>
  22. #include <sys/un.h>
  23. #include <sys/utsname.h>
  24. +#include <sys/sysmacros.h>
  25. #include <net/if_arp.h>
  26. #include <fcntl.h>
  27. #include <signal.h>
  28. diff --git a/src/device.c b/src/device.c
  29. index 2ae7f38..20920df 100644
  30. --- a/src/device.c
  31. +++ b/src/device.c
  32. @@ -33,6 +33,7 @@
  33. #include <sys/stat.h>
  34. #include <sys/time.h>
  35. #include <sys/resource.h>
  36. +#include <sys/sysmacros.h>
  37. #include <fcntl.h>
  38. #include <pwd.h>
  39. #include <grp.h>
  40. diff --git a/src/mount-monitor.c b/src/mount-monitor.c
  41. index 573a69c..0cfa167 100644
  42. --- a/src/mount-monitor.c
  43. +++ b/src/mount-monitor.c
  44. @@ -29,6 +29,7 @@
  45. #include <string.h>
  46. #include <sys/types.h>
  47. #include <sys/stat.h>
  48. +#include <sys/sysmacros.h>
  49. #include <mntent.h>
  50. #include <glib.h>
  51. diff --git a/tools/udisks.c b/tools/udisks.c
  52. index 97e80d7..22a7d87 100644
  53. --- a/tools/udisks.c
  54. +++ b/tools/udisks.c
  55. @@ -31,6 +31,7 @@
  56. #include <sys/types.h>
  57. #include <sys/stat.h>
  58. #include <sys/wait.h>
  59. +#include <sys/sysmacros.h>
  60. #include <fcntl.h>
  61. #include <pwd.h>
  62. #include <grp.h>
  63. diff --git a/tools/umount-udisks.c b/tools/umount-udisks.c
  64. index 2813fe0..d915660 100644
  65. --- a/tools/umount-udisks.c
  66. +++ b/tools/umount-udisks.c
  67. @@ -30,6 +30,7 @@
  68. #include <string.h>
  69. #include <sys/types.h>
  70. #include <sys/stat.h>
  71. +#include <sys/sysmacros.h>
  72. #include <fcntl.h>
  73. #include <pwd.h>
  74. #include <grp.h>
  75. --
  76. 2.14.1