musl-fix-includes.patch 1.37 KB
Newer Older
Timo Teräs's avatar
Timo Teräs committed
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
--- lm_sensors-3.3.4.orig/prog/dump/isadump.c
+++ lm_sensors-3.3.4/prog/dump/isadump.c
@@ -36,13 +36,7 @@
 #include "util.h"
 #include "superio.h"
 
-
-/* To keep glibc2 happy */
-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
 #include <sys/io.h>
-#else
-#include <asm/io.h>
-#endif
 
 #ifdef __powerpc__
 unsigned long isa_io_base = 0; /* XXX for now */
--- lm_sensors-3.3.4.orig/prog/dump/isaset.c
+++ lm_sensors-3.3.4/prog/dump/isaset.c
@@ -32,13 +32,7 @@
 #include <string.h>
 #include "util.h"
 
-
-/* To keep glibc2 happy */
-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
 #include <sys/io.h>
-#else
-#include <asm/io.h>
-#endif
 
 #ifdef __powerpc__
 unsigned long isa_io_base = 0; /* XXX for now */
--- lm_sensors-3.3.4.orig/prog/dump/superio.c
+++ lm_sensors-3.3.4/prog/dump/superio.c
@@ -20,12 +20,7 @@
 */
 
 #include <stdlib.h>
-
-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
 #include <sys/io.h>
-#else
-#include <asm/io.h>
-#endif
 
 #include "superio.h"
 
--- lm_sensors-3.3.4.orig/prog/dump/util.c
+++ lm_sensors-3.3.4/prog/dump/util.c
@@ -11,12 +11,7 @@
 #include <stdio.h>
 #include "util.h"
 
-/* To keep glibc2 happy */
-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
 #include <sys/io.h>
-#else
-#include <asm/io.h>
-#endif
 
 /* Return 1 if we should continue, 0 if we should abort */
 int user_ack(int def)