summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2009-09-24 11:14:12 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2009-09-24 11:14:12 +0000
commitd3b5fe3a2e24c2847940c17d7c617fc02b716abc (patch)
tree0e14feb2dba042309d0c676b5dcf7a9bfb39e442 /cpukit
parentRegenerate. (diff)
downloadrtems-d3b5fe3a2e24c2847940c17d7c617fc02b716abc.tar.bz2
2009-09-24 Joel Sherrill <joel.sherrill@oarcorp.com>
* libcsupport/src/getpagesize.c, posix/Makefile.am: Eliminate one copy of getpagesize() and make it return an int. * posix/src/getpagesize.c: Removed.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/ChangeLog6
-rw-r--r--cpukit/libcsupport/src/getpagesize.c6
-rw-r--r--cpukit/posix/Makefile.am2
-rw-r--r--cpukit/posix/src/getpagesize.c22
4 files changed, 9 insertions, 27 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 1f4956666b..f1950cf336 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-24 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * libcsupport/src/getpagesize.c, posix/Makefile.am: Eliminate one copy
+ of getpagesize() and make it return an int.
+ * posix/src/getpagesize.c: Removed.
+
2009-09-20 Joel Sherrill <joel.sherrill@oarcorp.com>
* posix/Makefile.am: Add getpagesize(). Now required by GNU Ada.
diff --git a/cpukit/libcsupport/src/getpagesize.c b/cpukit/libcsupport/src/getpagesize.c
index 43fef9d9ca..3ea44be1fa 100644
--- a/cpukit/libcsupport/src/getpagesize.c
+++ b/cpukit/libcsupport/src/getpagesize.c
@@ -9,16 +9,14 @@
#include <unistd.h>
#include <sys/param.h>
-/*PAGE
- *
+/*
* Get System Page Size (from SVR4 and 4.2+ BSD)
*
* This is not a functional version but the SPARC backend for at least
* gcc 2.8.1 plus gnat 3.13p and gcc 3.0.1 require it to be there and
* return a reasonable value.
*/
-
-size_t getpagesize(void)
+int getpagesize(void)
{
return PAGE_SIZE;
}
diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am
index c6facec168..a2c48a5dd3 100644
--- a/cpukit/posix/Makefile.am
+++ b/cpukit/posix/Makefile.am
@@ -173,7 +173,7 @@ EXTRA_DIST += src/README.mqueue
libposix_a_SOURCES += src/sched_getparam.c src/sched_getprioritymax.c \
src/sched_getprioritymin.c src/sched_getscheduler.c \
src/sched_rr_get_interval.c src/sched_setparam.c \
- src/sched_setscheduler.c src/sched_yield.c src/sysconf.c src/getpagesize.c
+ src/sched_setscheduler.c src/sched_yield.c src/sysconf.c
endif
endif
diff --git a/cpukit/posix/src/getpagesize.c b/cpukit/posix/src/getpagesize.c
deleted file mode 100644
index 9bcc2930fd..0000000000
--- a/cpukit/posix/src/getpagesize.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * COPYRIGHT (c) 1989-2009.
- * On-Line Applications Research Corporation (OAR).
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rtems.com/license/LICENSE.
- *
- * $Id$
- */
-
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <unistd.h>
-#include <sys/param.h>
-
-size_t getpagesize(void)
-{
- return PAGE_SIZE;
-}