ChangeLogTag: Thu Nov 15 17:54:41 2001 Craig Rodrigues <crodrigu@bbn.com>

5 files changed, 31 insertions, 31 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index a45d3a85e41..89fd08909d1 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Thu Nov 15 17:54:41 2001  Craig Rodrigues  <crodrigu@bbn.com>
+
+	* orbsvcs/orbsvcs/AV/RTCP_Channel.h:
+	* orbsvcs/orbsvcs/AV/RTCP_Packet.h:  Added #includes of ace/pre.h, 
+	  and ace/post.h.  Thanks to Rob Ruff.
+	* orbsvcs/orbsvcs/AV/md5.h:  Added names of variables to function
+	  prototypes to appease HPUX compiler.
+	* orbsvcs/orbsvcs/AV/md5.c:  Changed prototypes from "classic"
+	  to ISO/ANSI style function prototyping to appease KAI C++.
+
 Wed Nov 14 13:42:42 2001  Craig Rodrigues  <crodrigu@bbn.com>
 
 	* orbsvcs/orbsvcs/AV/RTCP.h:
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
index 66a63372f0f..25c31cefe81 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
@@ -3,6 +3,8 @@
 #ifndef RTCP_CHANNEL_INCLUDE
 #define RTCP_CHANNEL_INCLUDE
 
+#include "ace/pre.h"
+
 #include "ace/OS.h"
 #include "ace/Message_Block.h"
 #include "ace/SString.h"
@@ -214,4 +216,7 @@ private:
   unsigned int octets_sent_;
 };
 
-#endif
+#include "ace/post.h"
+#endif /* RTCP_CHANNEL_INCLUDE */
+
+
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
index 32163374aca..18a3d9c6152 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
@@ -2,6 +2,8 @@
 #ifndef RTCP_PACKET_INCLUDE
 #define RTCP_PACKET_INCLUDE
 
+#include "ace/pre.h"
+
 #include "ace/OS.h"
 
 /**
@@ -390,4 +392,6 @@ private:
   RR_Block *rr_;
 };
 
-#endif
+#include "ace/post.h"
+#endif  /*  RTCP_PACKET_INCLUDE  */
+
diff --git a/TAO/orbsvcs/orbsvcs/AV/md5.h b/TAO/orbsvcs/orbsvcs/AV/md5.h
index 4e4c1fe5261..034874fb852 100644
--- a/TAO/orbsvcs/orbsvcs/AV/md5.h
+++ b/TAO/orbsvcs/orbsvcs/AV/md5.h
@@ -36,12 +36,12 @@ extern "C" {
 #endif
 
 /* void MD5Init PROTO_LIST ((MD5_CTX *)); */
-void MD5Init (MD5_CTX *);
+void MD5Init (MD5_CTX *context);
 /* void MD5Update PROTO_LIST */
 /*  ((MD5_CTX *, unsigned char *, unsigned int)); */
-void MD5Update (MD5_CTX *, unsigned char *, unsigned int);
+void MD5Update (MD5_CTX *context, unsigned char *input, unsigned int inputLen);
 /* void MD5Final PROTO_LIST ((unsigned char [16], MD5_CTX *)); */
-void MD5Final (unsigned char [16], MD5_CTX *);
+void MD5Final (unsigned char digest[16], MD5_CTX *context);
 
 #ifdef __cplusplus
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/md5c.c b/TAO/orbsvcs/orbsvcs/AV/md5c.c
index edfdc67b87d..3d897f87ae2 100644
--- a/TAO/orbsvcs/orbsvcs/AV/md5c.c
+++ b/TAO/orbsvcs/orbsvcs/AV/md5c.c
@@ -120,10 +120,7 @@ MD5_CTX *context;                                        /* context */
   operation, processing another message block, and updating the
   context.
  */
-void MD5Update (context, input, inputLen)
-MD5_CTX *context;                                        /* context */
-unsigned char *input;                                /* input block */
-unsigned int inputLen;                     /* length of input block */
+void MD5Update (MD5_CTX *context, unsigned char *input, unsigned int inputLen)
 {
   unsigned int i, index, partLen;
 
@@ -163,9 +160,7 @@ unsigned int inputLen;                     /* length of input block */
 /* MD5 finalization. Ends an MD5 message-digest operation, writing the
   the message digest and zeroizing the context.
  */
-void MD5Final (digest, context)
-unsigned char digest[16];                         /* message digest */
-MD5_CTX *context;                                       /* context */
+void MD5Final (unsigned char digest[16], MD5_CTX *context)
 {
   unsigned char bits[8];
   unsigned int index, padLen;
@@ -192,9 +187,7 @@ MD5_CTX *context;                                       /* context */
 
 /* MD5 basic transformation. Transforms state based on block.
  */
-static void MD5Transform (state, block)
-UINT4 state[4];
-unsigned char block[64];
+static void MD5Transform (UINT4 state[4], unsigned char block[64])
 {
   UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
 
@@ -287,10 +280,7 @@ unsigned char block[64];
 /* Encodes input (UINT4) into output (unsigned char). Assumes len is
   a multiple of 4.
  */
-static void Encode (output, input, len)
-unsigned char *output;
-UINT4 *input;
-unsigned int len;
+static void Encode (unsigned char *output, UINT4 *input, unsigned int len)
 {
   unsigned int i, j;
 
@@ -305,10 +295,7 @@ unsigned int len;
 /* Decodes input (unsigned char) into output (UINT4). Assumes len is
   a multiple of 4.
  */
-static void Decode (output, input, len)
-UINT4 *output;
-unsigned char *input;
-unsigned int len;
+static void Decode (UINT4 *output, unsigned char *input, unsigned int len)
 {
   unsigned int i, j;
 
@@ -320,10 +307,7 @@ unsigned int len;
 /* Note: Replace "for loop" with standard memcpy if possible.
  */
 
-static void MD5_memcpy (output, input, len)
-POINTER output;
-POINTER input;
-unsigned int len;
+static void MD5_memcpy (POINTER output, POINTER input, unsigned int len)
 {
   unsigned int i;
 
@@ -334,10 +318,7 @@ unsigned int len;
 
 /* Note: Replace "for loop" with standard memset if possible.
  */
-static void MD5_memset (output, value, len)
-POINTER output;
-int value;
-unsigned int len;
+static void MD5_memset (POINTER output, int value, unsigned int len)
 {
   unsigned int i;