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.

61 lines
1.1 KiB

  1. --- a/src/system.h
  2. +++ b/src/system.h
  3. @@ -78,11 +78,6 @@
  4. #include <sys/stat.h>
  5. #endif
  6. -#ifdef HAVE_LINUX_SYSINFO_H
  7. -#define _LINUX_KERNEL_H
  8. -#include <linux/sysinfo.h>
  9. -#endif
  10. -
  11. #ifdef HAVE_TIME_H
  12. #include <time.h>
  13. #endif
  14. @@ -123,6 +118,11 @@
  15. #include <signal.h>
  16. #endif
  17. +#ifdef HAVE_SYS_SYSINFO_H
  18. +#define _LINUX_SYSINFO_H
  19. +#include <sys/sysinfo.h>
  20. +#endif
  21. +
  22. #if defined(__linux__)
  23. #include <asm/types.h>
  24. #include <linux/if.h>
  25. @@ -135,10 +135,6 @@
  26. #include <linux/un.h>
  27. #endif
  28. -#ifdef HAVE_SYS_SYSINFO_H
  29. -#include <sys/sysinfo.h>
  30. -#endif
  31. -
  32. #elif defined (__FreeBSD__) || defined (__APPLE__) || defined (__OpenBSD__) || defined (__NetBSD__)
  33. #include <net/if.h>
  34. #include <net/bpf.h>
  35. @@ -170,10 +166,6 @@
  36. #include <net/if_tun.h>
  37. #endif
  38. -#ifdef HAVE_NET_ETHERNET_H
  39. -#include <net/ethernet.h>
  40. -#endif
  41. -
  42. #ifdef HAVE_ASM_TYPES_H
  43. #include <asm/types.h>
  44. #endif
  45. --- a/src/chilli_limits.h
  46. +++ b/src/chilli_limits.h
  47. @@ -18,8 +18,8 @@
  48. *
  49. */
  50. -#ifndef _LIMITS_H
  51. -#define _LIMITS_H
  52. +#ifndef _CHILLI_LIMITS_H
  53. +#define _CHILLI_LIMITS_H
  54. /*
  55. * extracted from various .h files, needs some cleanup.