From: Gisle Aas <gisle@activestate.com>
Date: Fri, 27 Jan 2006 08:54:04 +0000 (+0000)
Subject: Simplify nested '#ifdef' by replacing it with '#elif defined()'
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=4b645107ff280e9efe46ab2fc89b620041a5b949;p=p5sagit%2Fp5-mst-13.2.git

Simplify nested '#ifdef' by replacing it with '#elif defined()'

p4raw-id: //depot/perl@26954
---

diff --git a/mg.c b/mg.c
index 8efed16..c277576 100644
--- a/mg.c
+++ b/mg.c
@@ -680,15 +680,14 @@ Perl_magic_get(pTHX_ SV *sv, MAGIC *mg)
 	break;
     case '\005':  /* ^E */
 	 if (nextchar == '\0') {
-#ifdef MACOS_TRADITIONAL
+#if defined(MACOS_TRADITIONAL)
 	     {
 		  char msg[256];
 
 		  sv_setnv(sv,(double)gMacPerl_OSErr);
 		  sv_setpv(sv, gMacPerl_OSErr ? GetSysErrText(gMacPerl_OSErr, msg) : "");
 	     }
-#else
-#ifdef VMS
+#elif defined(VMS)
 	     {
 #	          include <descrip.h>
 #	          include <starlet.h>
@@ -700,8 +699,7 @@ Perl_magic_get(pTHX_ SV *sv, MAGIC *mg)
 		  else
 		       sv_setpvn(sv,"",0);
 	     }
-#else
-#ifdef OS2
+#elif defined(OS2)
 	     if (!(_emx_env & 0x200)) {	/* Under DOS */
 		  sv_setnv(sv, (NV)errno);
 		  sv_setpv(sv, errno ? Strerror(errno) : "");
@@ -714,8 +712,7 @@ Perl_magic_get(pTHX_ SV *sv, MAGIC *mg)
 		  sv_setnv(sv, (NV)Perl_rc);
 		  sv_setpv(sv, os2error(Perl_rc));
 	     }
-#else
-#ifdef WIN32
+#elif defined(WIN32)
 	     {
 		  DWORD dwErr = GetLastError();
 		  sv_setnv(sv, (NV)dwErr);
@@ -734,9 +731,6 @@ Perl_magic_get(pTHX_ SV *sv, MAGIC *mg)
 		 errno = saveerrno;
 	     }
 #endif
-#endif
-#endif
-#endif
 	     SvRTRIM(sv);
 	     SvNOK_on(sv);	/* what a wonderful hack! */
 	 }