ME two filenames for same article

Russ Allbery rra at stanford.edu
Sun Apr 2 23:56:45 UTC 2000


Paul Theodoropoulos <paul at atgi.net> writes:

> here you go:

> In file included from perl.c:37:
> ../include/ppport.h:149: warning: `PERL_SUBVERSION' redefined
> /usr/local/lib/perl5/5.6.0/sun4-solaris/CORE/patchlevel.h:8: warning: this 
> is the location of the previous definition

Ah, I see the problem.  Could you try this patch and let me know if this
fixes it?  (I need to get 5.6.0 installed locally; not enough time to look
at it yet.)

Index: ppport.h
===================================================================
RCS file: /dist1/cvs/isc/inn/inn/include/ppport.h,v
retrieving revision 1.4
diff -u -r1.4 ppport.h
--- ppport.h	1999/11/19 08:49:20	1.4
+++ ppport.h	2000/04/02 23:56:19
@@ -13,6 +13,11 @@
 /* If you needed to customize this file for your project, please mention
    your changes. */
 
+/*
+   Modified for Perl 5.6.0 by Russ Allbery (use PERL_VERSION instead of
+   PERL_PATCHLEVEL).
+*/
+
 
 /*
    In order for a Perl extension module to be as portable as possible
@@ -139,21 +144,25 @@
 */
 
 
-#ifndef PERL_PATCHLEVEL
+#if !defined(PERL_VERSION) && !defined(PERL_PATCHLEVEL)
 #	ifndef __PATCHLEVEL_H_INCLUDED__
 #		include <patchlevel.h>
 #	endif
 #endif
-#ifndef PERL_PATCHLEVEL
-#	define PERL_PATCHLEVEL PATCHLEVEL
-#	define PERL_SUBVERSION SUBVERSION
+#ifndef PERL_VERSION
+#       ifdef PERL_PATCHLEVEL
+#               define PERL_VERSION    PERL_PATCHLEVEL
+#       else
+#               define PERL_VERSION    PATCHLEVEL
+#               define PERL_SUBVERSION SUBVERSION
+#       endif
 #endif
 
 #ifndef ERRSV
 #	define ERRSV perl_get_sv("@",FALSE)
 #endif
 
-#if (PERL_PATCHLEVEL < 4) || ((PERL_PATCHLEVEL == 4) && (PERL_SUBVERSION <= 4))
+#if (PERL_VERSION < 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION <= 4))
 #	define PL_sv_undef	sv_undef
 #	define PL_sv_yes	sv_yes
 #	define PL_sv_no		sv_no
@@ -165,7 +174,7 @@
 #	define PL_copline	copline
 #endif
 
-#if (PERL_PATCHLEVEL < 5)
+#if (PERL_VERSION < 5)
 #  ifdef WIN32
 #	define dTHR extern int Perl___notused
 #  else

-- 
Russ Allbery (rra at stanford.edu)             <http://www.eyrie.org/~eagle/>



More information about the inn-workers mailing list