From: Nicholas Clark Date: Thu, 9 Oct 2003 20:57:26 +0000 (+0000) Subject: Put all pre-processor #s on the first column (some compilers are picky) X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7e4e8c89c9cf9e2712eede00d12c71677e17b929;p=p5sagit%2Fp5-mst-13.2.git Put all pre-processor #s on the first column (some compilers are picky) [perl #24167] `#' comment signs not at the very beginning of a line p4raw-id: //depot/perl@21433 --- diff --git a/cop.h b/cop.h index 12eecdc..2e30eaf 100644 --- a/cop.h +++ b/cop.h @@ -37,11 +37,11 @@ struct cop { # define CopFILEGV(c) (CopFILE(c) \ ? gv_fetchfile(CopFILE(c)) : Nullgv) - #ifdef NETWARE - #define CopFILE_set(c,pv) ((c)->cop_file = savepv(pv)) - #else - #define CopFILE_set(c,pv) ((c)->cop_file = savesharedpv(pv)) - #endif +# ifdef NETWARE +# define CopFILE_set(c,pv) ((c)->cop_file = savepv(pv)) +# else +# define CopFILE_set(c,pv) ((c)->cop_file = savesharedpv(pv)) +# endif # define CopFILESV(c) (CopFILE(c) \ ? GvSV(gv_fetchfile(CopFILE(c))) : Nullsv) @@ -49,11 +49,11 @@ struct cop { ? GvAV(gv_fetchfile(CopFILE(c))) : Nullav) # define CopSTASHPV(c) ((c)->cop_stashpv) - #ifdef NETWARE - #define CopSTASHPV_set(c,pv) ((c)->cop_stashpv = ((pv) ? savepv(pv) : Nullch)) - #else - #define CopSTASHPV_set(c,pv) ((c)->cop_stashpv = savesharedpv(pv)) - #endif +# ifdef NETWARE +# define CopSTASHPV_set(c,pv) ((c)->cop_stashpv = ((pv) ? savepv(pv) : Nullch)) +# else +# define CopSTASHPV_set(c,pv) ((c)->cop_stashpv = savesharedpv(pv)) +# endif # define CopSTASH(c) (CopSTASHPV(c) \ ? gv_stashpv(CopSTASHPV(c),GV_ADD) : Nullhv) @@ -62,17 +62,17 @@ struct cop { && (CopSTASHPV(c) == HvNAME(hv) \ || (CopSTASHPV(c) && HvNAME(hv) \ && strEQ(CopSTASHPV(c), HvNAME(hv))))) - #ifdef NETWARE - #define CopSTASH_free(c) SAVECOPSTASH_FREE(c) - #else - #define CopSTASH_free(c) PerlMemShared_free(CopSTASHPV(c)) - #endif - - #ifdef NETWARE - #define CopFILE_free(c) SAVECOPFILE_FREE(c) - #else - #define CopFILE_free(c) (PerlMemShared_free(CopFILE(c)),(CopFILE(c) = Nullch)) - #endif +# ifdef NETWARE +# define CopSTASH_free(c) SAVECOPSTASH_FREE(c) +# else +# define CopSTASH_free(c) PerlMemShared_free(CopSTASHPV(c)) +# endif + +# ifdef NETWARE +# define CopFILE_free(c) SAVECOPFILE_FREE(c) +# else +# define CopFILE_free(c) (PerlMemShared_free(CopFILE(c)),(CopFILE(c) = Nullch)) +# endif #else # define CopFILEGV(c) ((c)->cop_filegv) # define CopFILEGV_set(c,gv) ((c)->cop_filegv = (GV*)SvREFCNT_inc(gv)) diff --git a/dosish.h b/dosish.h index 1e4a58b..8628472 100644 --- a/dosish.h +++ b/dosish.h @@ -60,9 +60,9 @@ * if you need the last, try #DEFINE MEM_SIZE unsigned long. */ #ifdef MSDOS - #ifndef DJGPP - #define HAS_64K_LIMIT - #endif +# ifndef DJGPP +# define HAS_64K_LIMIT +# endif #endif /* USEMYBINMODE diff --git a/ext/SDBM_File/sdbm/sdbm.h b/ext/SDBM_File/sdbm/sdbm.h index 8405fea..88e4b66 100644 --- a/ext/SDBM_File/sdbm/sdbm.h +++ b/ext/SDBM_File/sdbm/sdbm.h @@ -245,7 +245,7 @@ Free_t Perl_mfree proto((Malloc_t where)); # endif # endif # ifdef BUGGY_MSC - # pragma function(memcmp) +# pragma function(memcmp) # endif #else # ifndef memcmp diff --git a/iperlsys.h b/iperlsys.h index a712237..5bb0f05 100644 --- a/iperlsys.h +++ b/iperlsys.h @@ -810,7 +810,7 @@ struct IPerlMemInfo /* Shared memory macros */ #ifdef NETWARE - #define PerlMemShared_malloc(size) \ +#define PerlMemShared_malloc(size) \ (*PL_Mem->pMalloc)(PL_Mem, (size)) #define PerlMemShared_realloc(buf, size) \ (*PL_Mem->pRealloc)(PL_Mem, (buf), (size)) diff --git a/op.c b/op.c index f08e6a3..6dc36ca 100644 --- a/op.c +++ b/op.c @@ -78,9 +78,9 @@ Perl_Slab_Free(pTHX_ void *op) assert( ptr < ( (I32 **) slab + PERL_SLAB_SIZE) ); assert( *slab > 0 ); if (--(*slab) == 0) { - #ifdef NETWARE - #define PerlMemShared PerlMem - #endif +# ifdef NETWARE +# define PerlMemShared PerlMem +# endif PerlMemShared_free(slab); if (slab == PL_OpSlab) { diff --git a/perl.h b/perl.h index cb99abc..7730f45 100644 --- a/perl.h +++ b/perl.h @@ -580,7 +580,7 @@ int usleep(unsigned int); # endif # endif # ifdef BUGGY_MSC - # pragma function(memcmp) +# pragma function(memcmp) # endif #else # ifndef memcmp diff --git a/regcomp.c b/regcomp.c index 1b3805b..ded3c63 100644 --- a/regcomp.c +++ b/regcomp.c @@ -96,12 +96,12 @@ #endif /* op */ #ifdef MSDOS -# if defined(BUGGY_MSC6) +# if defined(BUGGY_MSC6) /* MSC 6.00A breaks on op/regexp.t test 85 unless we turn this off */ - # pragma optimize("a",off) +# pragma optimize("a",off) /* But MSC 6.00A is happy with 'w', for aliases only across function calls*/ - # pragma optimize("w",on ) -# endif /* BUGGY_MSC6 */ +# pragma optimize("w",on ) +# endif /* BUGGY_MSC6 */ #endif /* MSDOS */ #ifndef STATIC