diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2003-10-29 07:07:01 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2003-10-29 07:07:01 +0000 |
| commit | 957879d8908fab7bc9ee1b005c1836f3dcb95d07 (patch) | |
| tree | 7ad49b497d7e93dc2c69a03914ccf3e48dbf9a01 /net-www/mod_pcgi2/files | |
| parent | metalog fix0r (diff) | |
| download | gentoo-2-957879d8908fab7bc9ee1b005c1836f3dcb95d07.tar.gz gentoo-2-957879d8908fab7bc9ee1b005c1836f3dcb95d07.tar.bz2 gentoo-2-957879d8908fab7bc9ee1b005c1836f3dcb95d07.zip | |
fix compile issues with patch, needs to be sent upstream
Diffstat (limited to 'net-www/mod_pcgi2/files')
| -rw-r--r-- | net-www/mod_pcgi2/files/20_mod_pcgi.conf | 2 | ||||
| -rw-r--r-- | net-www/mod_pcgi2/files/mod_pcgi2-2.0.1-macrofix.patch | 33 |
2 files changed, 34 insertions, 1 deletions
diff --git a/net-www/mod_pcgi2/files/20_mod_pcgi.conf b/net-www/mod_pcgi2/files/20_mod_pcgi.conf index 69114015a82c..efccdeabe2ae 100644 --- a/net-www/mod_pcgi2/files/20_mod_pcgi.conf +++ b/net-www/mod_pcgi2/files/20_mod_pcgi.conf @@ -1,4 +1,4 @@ -<IfDefine MODPCGI> +<IfDefine PCGI> <IfModule !mod_pcgi2.c> LoadModule mod_pcgi2 extramodules/mod_pcgi2.so </IfModule> diff --git a/net-www/mod_pcgi2/files/mod_pcgi2-2.0.1-macrofix.patch b/net-www/mod_pcgi2/files/mod_pcgi2-2.0.1-macrofix.patch new file mode 100644 index 000000000000..5a3e17f6103a --- /dev/null +++ b/net-www/mod_pcgi2/files/mod_pcgi2-2.0.1-macrofix.patch @@ -0,0 +1,33 @@ +diff -ur pcgi2.old/mod_pcgi2.c pcgi2/mod_pcgi2.c +--- pcgi2.old/mod_pcgi2.c 2002-05-08 05:15:01.000000000 -0700 ++++ pcgi2/mod_pcgi2.c 2003-10-28 23:02:33.000000000 -0800 +@@ -166,12 +166,12 @@ + + + /* Merge resource records */ +-#define CREATE_pcgi_mergef(name, addr, maxsz) static void pcgi_merge_##name##(pcgiResource *r, pcgiResource *base, pcgiResource *overrides) \ ++#define CREATE_pcgi_mergef(name, addr, maxsz) static void pcgi_merge_##name(pcgiResource *r, pcgiResource *base, pcgiResource *overrides) \ + { \ +- if (overrides->##addr##[0]) { \ +- strncpy(r->##addr##, overrides->##addr##, maxsz); \ +- } else if (base->##addr##[0]) { \ +- strncpy(r->##addr##, base->##addr##, maxsz); \ ++ if (overrides->addr[0]) { \ ++ strncpy(r->addr, overrides->addr, maxsz); \ ++ } else if (base->addr[0]) { \ ++ strncpy(r->addr, base->addr, maxsz); \ + } \ + } + +@@ -314,9 +314,9 @@ + + + /* Parse command parameters */ +-#define CREATE_pcgi_setf(name, addr, maxsz) static const char *pcgi_set_##name##(cmd_parms *parms, void *r, const char *arg) \ ++#define CREATE_pcgi_setf(name, addr, maxsz) static const char *pcgi_set_##name(cmd_parms *parms, void *r, const char *arg) \ + { \ +- strncpy(((pcgiResource *)r)->##addr##, arg, maxsz); \ ++ strncpy(((pcgiResource *)r)->addr, arg, maxsz); \ + return NULL; \ + } + |