summaryrefslogtreecommitdiffstats
path: root/isys/linkdetect.c
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-07-08 03:00:53 +0000
committerJeremy Katz <katzj@redhat.com>2003-07-08 03:00:53 +0000
commit459119c94529602d08de465b7ebfa4871d328081 (patch)
tree369a7eb643938d6d51ef6f2d0c46561e61dcc0ae /isys/linkdetect.c
parent390977d3ee0ebc010168ce04573f63ae15458718 (diff)
downloadanaconda-459119c94529602d08de465b7ebfa4871d328081.tar.gz
anaconda-459119c94529602d08de465b7ebfa4871d328081.tar.xz
anaconda-459119c94529602d08de465b7ebfa4871d328081.zip
massive merge from taroon branch. changes are all over the place, but a
summary of looking through the diff is * clean up warnings, we build with -Wall -Werror here too * product.img stuff * max logical partitions enforcement * 1 TB max fs size * ethtool stuff * autopart in kickstart * driver disk fixes * RHEL upgrade stuff * network driver disks * variant pkgorder/tree splitting
Diffstat (limited to 'isys/linkdetect.c')
-rw-r--r--isys/linkdetect.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/isys/linkdetect.c b/isys/linkdetect.c
index 10917db82..10849d303 100644
--- a/isys/linkdetect.c
+++ b/isys/linkdetect.c
@@ -29,30 +29,12 @@
#include <sys/types.h>
#include <net/if.h>
-/* type definitions so that the kernel-ish includes can be shared */
-#ifndef uint8_t
-# define uint8_t unsigned char
-#endif
-#ifndef uint16_t
-# define uint16_t unsigned short int
-#endif
-#ifndef uint32_t
-# define uint32_t unsigned int
-#endif
-#ifndef uint64_t
-# define uint64_t unsigned long long int
-#endif
-typedef uint64_t u64;
-typedef uint32_t u32;
-typedef uint16_t u16;
-typedef uint8_t u8;
-
#ifdef DIET
typedef void * caddr_t;
#endif
-
#include <linux/sockios.h>
+#include "net.h"
#include "mii.h"
#include "ethtool-copy.h"