[PATCH] klibc_fixups: remove unneeded stuff

diff --git a/Makefile b/Makefile
index 99a7618795db172c7496306a8a09c12a51fdea7d..7c159b3d312f4c3de14f33c659ad9b358db6678b 100644 (file)
--- 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 (file)
index 439608e..0000000
--- 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 (file)
index ea79a2d..0000000
--- 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 c4ee32457322799f46af50c1285a949fc608d52a..c44e9d5ff592b12fe38951c7761a44a38f591888 100644 (file)
--- 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 9e3a6c96deb9d0405e442f06d4402192f9e09d6c..62eaa9fec4f304ea38066d690388c873afaa5fb1 100644 (file)
--- 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 30bd9b408991dd432a91598c23f5baa9674ceea3..838427797dda5570cc567cefe89a560c117d0377 100644 (file)
--- 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>