summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>2005-03-05 07:16:21 +0100
committerGreg KH <gregkh@suse.de>2005-04-26 23:48:48 -0700
commit733677e2c21b1ea3789c5296c84c1730d9ce498d (patch)
treefbc1136c4c8cc4f225b23b8211d953f75a617ce3
parent03fd7a3ad3438c7ae4525215ac58c3d94133cc35 (diff)
[PATCH] klibc_fixups: remove unneeded stuff
-rw-r--r--Makefile1
-rw-r--r--klibc_fixups/malloc.h9
-rw-r--r--klibc_fixups/mntent.h39
-rw-r--r--libsysfs/dlist.c1
-rw-r--r--libsysfs/dlist.h5
-rw-r--r--libsysfs/sysfs.h1
6 files changed, 4 insertions, 52 deletions
diff --git a/Makefile b/Makefile
index 99a7618795..7c159b3d31 100644
--- a/Makefile
+++ b/Makefile
@@ -202,7 +202,6 @@ ifeq ($(strip $(USE_KLIBC)),true)
HEADERS += \
klibc_fixups/klibc_fixups.h \
- klibc_fixups/mntent.h \
klibc_fixups/pwd.h
KLIBC_FIXUP_OBJS = \
diff --git a/klibc_fixups/malloc.h b/klibc_fixups/malloc.h
deleted file mode 100644
index 439608e3c4..0000000000
--- a/klibc_fixups/malloc.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef __KLIBC__
-
-#ifndef _MALLOC_H
-#define _MALLOC_H
-
-#include <stdlib.h>
-
-#endif /* _MALLOC_H */
-#endif /* __KLIBC__ */
diff --git a/klibc_fixups/mntent.h b/klibc_fixups/mntent.h
deleted file mode 100644
index ea79a2dd63..0000000000
--- a/klibc_fixups/mntent.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifdef __KLIBC__
-
-#ifndef _MNTENT_H
-#define _MNTENT_H
-
-#include <stdio.h>
-
-struct mntent
-{
- char *mnt_fsname;
- char *mnt_dir;
- char *mnt_type;
- char *mnt_opts;
- int mnt_freq;
- int mnt_passno;
-};
-
-static inline FILE *setmntent (const char *file, const char *mode)
-{
- return (FILE *) 1;
-}
-
-static inline struct mntent *getmntent (FILE *stream)
-{
- static struct mntent mntent = {
- .mnt_dir = "/sys",
- .mnt_type = "sysfs"
- };
-
- return &mntent;
-}
-
-static inline int endmntent (FILE *stream)
-{
- return 0;
-}
-
-#endif /* _MNTENT_H */
-#endif /* __KLIBC__ */
diff --git a/libsysfs/dlist.c b/libsysfs/dlist.c
index c4ee324573..c44e9d5ff5 100644
--- a/libsysfs/dlist.c
+++ b/libsysfs/dlist.c
@@ -27,6 +27,7 @@
* delete function. Otherwise dlist will just use free.
*/
+#include "stdlib.h"
#include "dlist.h"
/*
diff --git a/libsysfs/dlist.h b/libsysfs/dlist.h
index 9e3a6c96de..62eaa9fec4 100644
--- a/libsysfs/dlist.h
+++ b/libsysfs/dlist.h
@@ -50,9 +50,10 @@
* Just use the dlist_(insert|delete)_(before|after) macros if you do not want
* to think about it.
-
*/
-#include <malloc.h>
+
+#include <stddef.h>
+
typedef struct dl_node {
struct dl_node *prev;
struct dl_node *next;
diff --git a/libsysfs/sysfs.h b/libsysfs/sysfs.h
index 30bd9b4089..838427797d 100644
--- a/libsysfs/sysfs.h
+++ b/libsysfs/sysfs.h
@@ -28,7 +28,6 @@
#include <unistd.h>
#include <string.h>
#include <ctype.h>
-#include <mntent.h>
#include <dirent.h>
#include <sys/stat.h>
#include <fcntl.h>