dougm 00/04/01 15:08:24
Modified: . Changes
src/modules/perl apache_inc.h
Log:
5.6.0+win32 typedef,prototype clash fixes
Revision Changes Path
1.451 +3 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -r1.450 -r1.451
--- Changes 2000/03/31 17:11:02 1.450
+++ Changes 2000/04/01 23:08:21 1.451
@@ -10,6 +10,9 @@
=item 1.22_01-dev
+5.6.0+win32 typedef,prototype clash fixes
+[Randy Kobes <[EMAIL PROTECTED]>]
+
add $r->server->loglevel() and relevant constants. Suggested
by Geoffrey Young [Eric Cholet <[EMAIL PROTECTED]>]
1.4 +124 -0 modperl/src/modules/perl/apache_inc.h
Index: apache_inc.h
===================================================================
RCS file: /home/cvs/modperl/src/modules/perl/apache_inc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apache_inc.h 2000/03/23 05:56:10 1.3
+++ apache_inc.h 2000/04/01 23:08:22 1.4
@@ -39,6 +39,67 @@
#endif
+#ifdef WIN32
+
+#ifdef uid_t
+#define apache_uid_t uid_t
+#undef uid_t
+#endif
+#define uid_t apache_uid_t
+
+#ifdef gid_t
+#define apache_gid_t gid_t
+#undef gid_t
+#endif
+#define gid_t apache_gid_t
+
+#ifdef mode_t
+#define apache_mode_t mode_t
+#undef mode_t
+#endif
+#define mode_t apache_mode_t
+
+#ifdef stat
+#define apache_stat stat
+#undef stat
+#endif
+
+#ifdef sleep
+#define apache_sleep sleep
+#undef sleep
+#endif
+
+#ifdef PERL_IS_5_6
+
+#ifdef opendir
+#define apache_opendir opendir
+#undef opendir
+#endif
+
+#ifdef readdir
+#define apache_readdir readdir
+#undef readdir
+#endif
+
+#ifdef closedir
+#define apache_closedir closedir
+#undef closedir
+#endif
+
+#ifdef crypt
+#define apache_crypt crypt
+#undef crypt
+#endif
+
+#ifdef errno
+#define apache_errno errno
+#undef errno
+#endif
+
+#endif /* endif PERL_IS_56 */
+
+#endif /* endif WIN32 */
+
#ifndef _INCLUDE_APACHE_FIRST
#ifdef __cplusplus
extern "C" {
@@ -119,3 +180,66 @@
#endif
#endif
+
+#ifdef WIN32
+
+#undef uid_t
+#ifdef apache_uid_t
+#define uid_t apache_uid_t
+#undef apache_uid_t
+#endif
+
+#undef gid_t
+#ifdef apache_gid_t
+#define gid_t apache_gid_t
+#undef apache_gid_t
+#endif
+
+#undef mode_t
+#ifdef apache_mode_t
+#define gid_t apache_mode_t
+#undef apache_mode_t
+#endif
+
+#ifdef apache_stat
+#undef stat
+#define stat apache_stat
+#undef apache_stat
+#endif
+
+#ifdef apache_sleep
+#undef sleep
+#define sleep apache_sleep
+#undef apache_sleep
+#endif
+
+#ifdef PERL_IS_5_6
+
+#ifdef apache_opendir
+#undef opendir
+#define opendir apache_opendir
+#undef apache_opendir
+#endif
+
+#ifdef apache_readdir
+#undef readdir
+#define readdir apache_readdir
+#undef apache_readdir
+#endif
+
+#ifdef apache_closedir
+#undef closedir
+#define closedir apache_closedir
+#undef apache_closedir
+#endif
+
+#ifdef apache_crypt
+#undef crypt
+#define crypt apache_crypt
+#undef apache_crypt
+#endif
+
+#endif /* endif PERL_IS_5_6 */
+
+#endif /* endif WIN32 */
+
