Author: joes
Date: Sun Aug 14 20:45:15 2005
New Revision: 232743
URL: http://svn.apache.org/viewcvs?rev=232743&view=rev
Log:
Make c++ compilers happy with explicit casts for apreq_param_charset_*.
Modified:
httpd/apreq/trunk/include/apreq_param.h
httpd/apreq/trunk/include/apreq_version.h
Modified: httpd/apreq/trunk/include/apreq_param.h
URL:
http://svn.apache.org/viewcvs/httpd/apreq/trunk/include/apreq_param.h?rev=232743&r1=232742&r2=232743&view=diff
==============================================================================
--- httpd/apreq/trunk/include/apreq_param.h (original)
+++ httpd/apreq/trunk/include/apreq_param.h Sun Aug 14 20:45:15 2005
@@ -61,8 +61,9 @@
/** Sets the character encoding for this parameter. */
static APR_INLINE
-apreq_charset_t apreq_param_charset_set(apreq_param_t *p, unsigned char c) {
- unsigned char old = APREQ_FLAGS_GET(p->flags, APREQ_CHARSET);
+apreq_charset_t apreq_param_charset_set(apreq_param_t *p, apreq_charset_t c) {
+ apreq_charset_t old = (apreq_charset_t)
+ APREQ_FLAGS_GET(p->flags, APREQ_CHARSET);
APREQ_FLAGS_SET(p->flags, APREQ_CHARSET, c);
return old;
}
@@ -70,7 +71,7 @@
/** Gets the character encoding for this parameter. */
static APR_INLINE
apreq_charset_t apreq_param_charset_get(apreq_param_t *p) {
- return APREQ_FLAGS_GET(p->flags, APREQ_CHARSET);
+ return (apreq_charset_t)APREQ_FLAGS_GET(p->flags, APREQ_CHARSET);
}
Modified: httpd/apreq/trunk/include/apreq_version.h
URL:
http://svn.apache.org/viewcvs/httpd/apreq/trunk/include/apreq_version.h?rev=232743&r1=232742&r2=232743&view=diff
==============================================================================
--- httpd/apreq/trunk/include/apreq_version.h (original)
+++ httpd/apreq/trunk/include/apreq_version.h Sun Aug 14 20:45:15 2005
@@ -58,10 +58,10 @@
* Minor API changes that do not cause binary compatibility problems.
* Should be reset to 0 when upgrading APREQ_MAJOR_VERSION
*/
-#define APREQ_MINOR_VERSION 1
+#define APREQ_MINOR_VERSION 3
/** patch level */
-#define APREQ_PATCH_VERSION 5
+#define APREQ_PATCH_VERSION 0
/**
* This symbol is defined for internal, "development" copies of libapreq.
