From: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>
Date: Thu, 5 Apr 2007 16:26:18 +0000 (+0000)
Subject: C++ compilation fix by Steve Peters
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=83a6ff2e11375007a9cb2baae28363e5fd7c86fe;p=p5sagit%2Fp5-mst-13.2.git

C++ compilation fix by Steve Peters

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

diff --git a/perl.h b/perl.h
index 0571d3e..0cff283 100644
--- a/perl.h
+++ b/perl.h
@@ -1200,13 +1200,13 @@ EXTERN_C char *crypt(const char *, const char *);
 EXTERN_C char **environ;
 #endif
 
-#if defined(__OpenBSD__) && defined(__cplusplus)
+#if defined(__cplusplus)
+#  if defined(__OpenBSD__) || defined(__FreeBSD__)
 EXTERN_C char **environ;
-#endif
-
-#if defined(__CYGWIN__) && defined(__cplusplus)
+#  elif defined(__CYGWIN__)
 EXTERN_C char *crypt(const char *, const char *);
 #endif
+#endif
 
 #ifdef SETERRNO
 # undef SETERRNO  /* SOCKS might have defined this */