From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Tue, 14 Mar 2000 02:00:24 +0000 (+0000)
Subject: Integrate with Sarathy.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=365a320da8098c17cca46a405b957deba5e7b2ab;p=p5sagit%2Fp5-mst-13.2.git

Integrate with Sarathy.

p4raw-id: //depot/cfgperl@5717
---

365a320da8098c17cca46a405b957deba5e7b2ab
diff --cc patchlevel.h
index 7da61f0,7da61f0..0b8d9be
--- a/patchlevel.h
+++ b/patchlevel.h
@@@ -68,7 -68,7 +68,7 @@@
  	applied different patches than you.
   */
  #if !defined(PERL_PATCHLEVEL_H_IMPLICIT) && !defined(LOCAL_PATCH_COUNT)
--static	char	*local_patches[] = {
++static	char	* __attribute__ ((unused)) local_patches[] = {
  	NULL
  	, "v5.6.0-RC1"
  	,NULL
diff --cc perl.h
index 2b4465c,2b4465c..6ee2c0c
--- a/perl.h
+++ b/perl.h
@@@ -151,6 -151,6 +151,14 @@@ functions are now member functions of t
  
  */
  
++#ifndef NEXT30_NO_ATTRIBUTE
++#  ifndef HASATTRIBUTE       /* disable GNU-cc attribute checking? */
++#    ifdef  __attribute__      /* Avoid possible redefinition errors */
++#      undef  __attribute__
++#    endif
++#    define __attribute__(attr)
++#  endif
++#endif
  
  class CPerlObj;
  
@@@ -221,7 -221,7 +229,7 @@@ struct perl_thread
  #endif
  
  #define NOOP (void)0
--#define dNOOP extern int Perl___notused
++#define dNOOP extern int __attribute__ ((unused)) Perl___notused
  
  #ifndef pTHX
  #  define pTHX		void
@@@ -2671,15 -2671,15 +2679,6 @@@ typedef void *Thread
  #  define PERL_CALLCONV
  #endif 
  
--#ifndef NEXT30_NO_ATTRIBUTE
--#  ifndef HASATTRIBUTE       /* disable GNU-cc attribute checking? */
--#    ifdef  __attribute__      /* Avoid possible redefinition errors */
--#      undef  __attribute__
--#    endif
--#    define __attribute__(attr)
--#  endif
--#endif
--
  #ifdef PERL_OBJECT
  #  define PERL_DECL_PROT
  #endif