PR:

Obtained from:
Submitted by:	William Rowe
Reviewed by:

  Created ap_base64.h to extract those declarations for clarity from ap.h

  CORE_PRIVATE, httpd.h do not belong in library functions, removed from ap.lib

  Use apr headers for declarations in ap.lib stuff, kill AP_LONG from ap_sha1.h

  Move credit to lib/apr/lib/ap_snprintf.c from ap.h for authorship


git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@57799 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 6 deletions

diff --git a/include/apr_sha1.h b/include/apr_sha1.h
index c13b01e4..cfd40634 100644
--- a/include/apr_sha1.h
+++ b/include/apr_sha1.h
@@ -74,13 +74,11 @@ extern "C" {
 #define AP_SHA1PW_ID "{SHA}"
 #define AP_SHA1PW_IDLEN 5
 
-typedef unsigned long AP_LONG;     /* a 32-bit quantity */
-
 typedef struct {
-    AP_LONG digest[5];             /* message digest */
-    AP_LONG count_lo, count_hi;    /* 64-bit bit count */
-    AP_LONG data[16];              /* SHA data buffer */
-    int local;                     /* unprocessed amount in data */
+    ap_uint32_t digest[5];          /* message digest */
+    ap_uint32_t count_lo, count_hi; /* 64-bit bit count */
+    ap_uint32_t data[16];           /* SHA data buffer */
+    int local;                      /* unprocessed amount in data */
 } AP_SHA1_CTX;
 
 API_EXPORT(void) ap_sha1_base64(const char *clear, int len, char *out);