From: kay.sievers@vrfy.org <kay.sievers@vrfy.org>
Date: Sun, 6 Mar 2005 01:09:30 +0000 (+0100)
Subject: [PATCH] klibc_fixups: remove no longer needed stuff
X-Git-Tag: 055~42
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f335ca4afaa189799225f856f3af8b3d9fd2e1c;p=systemd

[PATCH] klibc_fixups: remove no longer needed stuff
---

diff --git a/Makefile b/Makefile
index ac60ade5..8184620a 100644
--- a/Makefile
+++ b/Makefile
@@ -191,7 +191,6 @@ ifeq ($(strip $(USE_KLIBC)),true)
 		$(OPTFLAGS) $(REQFLAGS)				\
 		-D__KLIBC__ -fno-builtin-printf			\
 		-I$(KLIBC_FIXUPS_DIR)				\
-		-include $(KLIBC_FIXUPS_DIR)/klibc_fixups.h	\
 		-I$(INCLUDE_DIR)				\
 		-I$(INCLUDE_DIR)/arch/$(ARCH)			\
 		-I$(INCLUDE_DIR)/bits$(BITSIZE)			\
@@ -201,7 +200,6 @@ ifeq ($(strip $(USE_KLIBC)),true)
 	LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs
 
 	HEADERS	+= \
-		klibc_fixups/klibc_fixups.h	\
 		klibc_fixups/pwd.h
 
 	KLIBC_FIXUP_OBJS = \
diff --git a/klibc_fixups/klibc_fixups.h b/klibc_fixups/klibc_fixups.h
deleted file mode 100644
index 13011b68..00000000
--- a/klibc_fixups/klibc_fixups.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifdef __KLIBC__
-
-#ifndef _KLIBC_FIXUPS_H
-#define _KLIBC_FIXUPS_H
-
-#define _KLIBC_HAS_ARCH_SIG_ATOMIC_T
-#include <unistd.h>
-
-#define _SC_PAGESIZE		0x66
-static inline long int sysconf(int name)
-{
-	if (name == _SC_PAGESIZE)
-		return getpagesize();
-
-	return -1;
-}
-
-struct exit_status {
-	short int e_termination;	/* process termination status */
-	short int e_exit;		/* process exit status */
-};
-
-#endif /* KLIBC_FIXUPS_H */
-#endif /* __KLIBC__ */
diff --git a/libsysfs/sysfs_dir.c b/libsysfs/sysfs_dir.c
index c8661793..63eec7bb 100644
--- a/libsysfs/sysfs_dir.c
+++ b/libsysfs/sysfs_dir.c
@@ -150,7 +150,7 @@ int sysfs_read_attribute(struct sysfs_attribute *sysattr)
 		errno = EACCES;
 		return -1;
 	}
-	pgsize = sysconf(_SC_PAGESIZE);
+	pgsize = getpagesize();
 	fbuf = (char *)calloc(1, pgsize+1);
 	if (!fbuf) {
 		dprintf("calloc failed\n");