summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-10-29 10:38:40 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-10-29 10:38:40 +0000
commit9929e2d2316d03196d4aad2b5fb0ffe6abb884e1 (patch)
tree0fc2bad9916ffb8168d9c353d647c8299b3cbf13
parent0f9ff459574cf5fb287fe6d71cb3bbe26e0bc626 (diff)
downloadrtems-9929e2d2316d03196d4aad2b5fb0ffe6abb884e1.tar.bz2
2004-10-29 Ralf Corsepius <ralf_corsepius@rtems.org>
* score/src/coremsg.c: Eliminate unsigned32. * score/include/rtems/system.h: Set __RTEMS_REVISION__ to 99. * librpc/include/rpc/xdr.h: Use elipsis in xdrproc_t prototype.
-rw-r--r--cpukit/ChangeLog6
-rw-r--r--cpukit/librpc/include/rpc/xdr.h2
-rw-r--r--cpukit/score/include/rtems/system.h2
-rw-r--r--cpukit/score/src/coremsg.c14
4 files changed, 15 insertions, 9 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 2583aa1733..1c66b0fafc 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-29 Ralf Corsepius <ralf_corsepius@rtems.org>
+
+ * score/src/coremsg.c: Eliminate unsigned32.
+ * score/include/rtems/system.h: Set __RTEMS_REVISION__ to 99.
+ * librpc/include/rpc/xdr.h: Use elipsis in xdrproc_t prototype.
+
2004-10-28 Ralf Corsepius <ralf_corsepius@rtems.org>
* libcsupport/include/inttypes.h: #include <sys/_inttypes.h>
diff --git a/cpukit/librpc/include/rpc/xdr.h b/cpukit/librpc/include/rpc/xdr.h
index 0b67b48510..578c0f2381 100644
--- a/cpukit/librpc/include/rpc/xdr.h
+++ b/cpukit/librpc/include/rpc/xdr.h
@@ -135,7 +135,7 @@ typedef bool_t (*xdrproc_t) __P((XDR *, void *, u_int));
/*
* XXX can't actually prototype it, because some take two args!!!
*/
-typedef bool_t (*xdrproc_t) __P((/* XDR *, void *, u_int */));
+typedef bool_t (*xdrproc_t) (XDR *, void *, ...);
#endif
/*
diff --git a/cpukit/score/include/rtems/system.h b/cpukit/score/include/rtems/system.h
index c2fbf7694b..90501dd3d3 100644
--- a/cpukit/score/include/rtems/system.h
+++ b/cpukit/score/include/rtems/system.h
@@ -27,7 +27,7 @@ extern "C" {
*/
#define __RTEMS_MAJOR__ 4
#define __RTEMS_MINOR__ 6
-#define __RTEMS_REVISION__ 0
+#define __RTEMS_REVISION__ 99
/*
* The cpu options include file defines all cpu dependent
diff --git a/cpukit/score/src/coremsg.c b/cpukit/score/src/coremsg.c
index 120e03e360..94098e0b96 100644
--- a/cpukit/score/src/coremsg.c
+++ b/cpukit/score/src/coremsg.c
@@ -51,12 +51,12 @@
boolean _CORE_message_queue_Initialize(
CORE_message_queue_Control *the_message_queue,
CORE_message_queue_Attributes *the_message_queue_attributes,
- unsigned32 maximum_pending_messages,
- unsigned32 maximum_message_size
+ uint32_t maximum_pending_messages,
+ uint32_t maximum_message_size
)
{
- unsigned32 message_buffering_required;
- unsigned32 allocated_message_size;
+ uint32_t message_buffering_required;
+ uint32_t allocated_message_size;
the_message_queue->maximum_pending_messages = maximum_pending_messages;
the_message_queue->number_of_pending_messages = 0;
@@ -69,9 +69,9 @@ boolean _CORE_message_queue_Initialize(
*/
allocated_message_size = maximum_message_size;
- if (allocated_message_size & (sizeof(unsigned32) - 1)) {
- allocated_message_size += sizeof(unsigned32);
- allocated_message_size &= ~(sizeof(unsigned32) - 1);
+ if (allocated_message_size & (sizeof(uint32_t) - 1)) {
+ allocated_message_size += sizeof(uint32_t);
+ allocated_message_size &= ~(sizeof(uint32_t) - 1);
}
if (allocated_message_size < maximum_message_size)