stas 2003/09/22 10:43:41
Modified: xs/APR/PerlIO apr_perlio.c
src/modules/perl mod_perl.h
Log:
make MP_LARGE_FILES_CONFLICT and related defines defined/!defined, instead of
assigning values to them. fix the logic of setting the MP_LARGE_FILES_CONFLICT
define.
Revision Changes Path
1.34 +1 -1 modperl-2.0/xs/APR/PerlIO/apr_perlio.c
Index: apr_perlio.c
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/APR/PerlIO/apr_perlio.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -u -r1.33 -r1.34
--- apr_perlio.c 4 Sep 2003 23:57:58 -0000 1.33
+++ apr_perlio.c 22 Sep 2003 17:43:41 -0000 1.34
@@ -224,7 +224,7 @@
apr_status_t rc;
apr_off_t seek_offset = 0;
-#if MP_LARGE_FILES_CONFLICT
+#ifdef MP_LARGE_FILES_CONFLICT
if (offset != 0) {
Perl_croak(aTHX_ "PerlIO::APR::seek with non-zero offset"
"is not supported with Perl built w/ -Duselargefiles"
1.61 +17 -12 modperl-2.0/src/modules/perl/mod_perl.h
Index: mod_perl.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -u -r1.60 -r1.61
--- mod_perl.h 20 Aug 2003 23:20:14 -0000 1.60
+++ mod_perl.h 22 Sep 2003 17:43:41 -0000 1.61
@@ -22,26 +22,31 @@
#include "modperl_constants.h"
/* both perl and apr have largefile support enabled */
-#define MP_LARGE_FILES_ENABLED \
- (defined(USE_LARGE_FILES) && APR_HAS_LARGE_FILES)
+#if defined(USE_LARGE_FILES) && APR_HAS_LARGE_FILES
+#define MP_LARGE_FILES_ENABLED
+#endif
/* both perl and apr have largefile support disabled */
-#define MP_LARGE_FILES_DISABLED \
- (!defined(USE_LARGE_FILES) && !APR_HAS_LARGE_FILES)
+#if (!defined(USE_LARGE_FILES)) && !APR_HAS_LARGE_FILES
+#define MP_LARGE_FILES_DISABLED
+#endif
-/* perl support is enabled, apr support is disabled */
-#define MP_LARGE_FILES_PERL_ONLY \
- (defined(USE_LARGE_FILES) && !APR_HAS_LARGE_FILES)
+/* perl largefile support is enabled, apr support is disabled */
+#if defined(USE_LARGE_FILES) && !APR_HAS_LARGE_FILES
+#define MP_LARGE_FILES_PERL_ONLY
+#endif
-/* apr support is enabled, perl support is disabled */
-#define MP_LARGE_FILES_APR_ONLY \
- (!defined(USE_LARGE_FILES) && APR_HAS_LARGE_FILES)
+/* apr largefile support is enabled, perl support is disabled */
+#if (!defined(USE_LARGE_FILES)) && APR_HAS_LARGE_FILES
+#define MP_LARGE_FILES_APR_ONLY
+#endif
/* conflict due to not have either both perl and apr
* support enabled or both disabled
*/
-#define MP_LARGE_FILES_CONFLICT \
- !(MP_LARGE_FILES_ENABLED || MP_LARGE_FILES_DISABLED)
+#if defined(MP_LARGE_FILES_APR_ONLY) || defined(MP_LARGE_FILES_PERL_ONLY)
+#define MP_LARGE_FILES_CONFLICT
+#endif
#ifdef MP_USE_GTOP
#include "modperl_gtop.h"
