You are viewing a plain text version of this content. The canonical link for it is here.
Posted to test-cvs@httpd.apache.org by je...@apache.org on 2003/01/29 07:16:59 UTC
cvs commit: httpd-test/flood CHANGES flood_round_robin.c
jerenkrantz 2003/01/28 22:16:59
Modified: flood CHANGES flood_round_robin.c
Log:
Fixed PASSTHROUGH collision in flood_round_robin.c.
This patch fixes compile errors in flood_round_robin.c
resulting from the Windows header file wingdi.h. That
header file defines PASSTHROUGH, which is the same
identifier used as an enumerated constant for type
expand_param_e. The enumerated constants now use a
prefix, "EPE_", to help make their names more unique.
Below are the compile errors this patch addresses:
<snip>
Submitted by: Phi-Long Tran <pt...@pobox.com>
Reviewed by: Justin Erenkrantz
Revision Changes Path
1.44 +3 -0 httpd-test/flood/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-test/flood/CHANGES,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -u -r1.43 -r1.44
--- CHANGES 29 Jan 2003 06:13:27 -0000 1.43
+++ CHANGES 29 Jan 2003 06:16:59 -0000 1.44
@@ -1,5 +1,8 @@
Changes since 1.0:
+* Namespace protect expand_param_e enum values to not conflict with Win32
+ headers. [Phi-Long Tran <pt...@pobox.com>]
+
* Added error handling for failed config-file open.
[Phi-Long Tran <pt...@pobox.com>]
1.33 +8 -8 httpd-test/flood/flood_round_robin.c
Index: flood_round_robin.c
===================================================================
RCS file: /home/cvs/httpd-test/flood/flood_round_robin.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -u -r1.32 -r1.33
--- flood_round_robin.c 16 Sep 2002 09:55:07 -0000 1.32
+++ flood_round_robin.c 29 Jan 2003 06:16:59 -0000 1.33
@@ -97,9 +97,9 @@
extern apr_file_t *local_stderr;
typedef enum {
- EXPAND,
- EXPAND_SET,
- PASSTHROUGH
+ EPE_EXPAND,
+ EPE_EXPAND_SET,
+ EPE_PASSTHROUGH
} expand_param_e;
typedef struct {
@@ -236,12 +236,12 @@
static char *expand_param_string(round_robin_profile_t *rp, char *template)
{
- return handle_param_string(rp, template, EXPAND);
+ return handle_param_string(rp, template, EPE_EXPAND);
}
static char *parse_param_string(round_robin_profile_t *rp, char *template)
{
- return handle_param_string(rp, template, EXPAND_SET);
+ return handle_param_string(rp, template, EPE_EXPAND_SET);
}
/* Construct a request */
@@ -598,19 +598,19 @@
p->url[p->current_url].payloadtemplate =
handle_param_string(p,
p->url[p->current_url].payloadtemplate,
- PASSTHROUGH);
+ EPE_PASSTHROUGH);
}
if (p->url[p->current_url].requesttemplate) {
p->url[p->current_url].requesttemplate =
handle_param_string(p,
p->url[p->current_url].requesttemplate,
- PASSTHROUGH);
+ EPE_PASSTHROUGH);
}
if (p->url[p->current_url].responsetemplate) {
p->url[p->current_url].responsetemplate =
handle_param_string(p,
p->url[p->current_url].responsetemplate,
- PASSTHROUGH);
+ EPE_PASSTHROUGH);
}
p->current_url++;
}