summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2006-10-31 22:24:39 (GMT)
committerdas <das>2006-10-31 22:24:39 (GMT)
commit37387d61ef7f0429d0fc459901850838b6935f0d (patch)
treee1661ef8b0037e50d49ad1516252af0d65c3d699
parentf2bac5b1bba338e3beb5b199a8126d4e838b6d82 (diff)
downloadtcl-37387d61ef7f0429d0fc459901850838b6935f0d.zip
tcl-37387d61ef7f0429d0fc459901850838b6935f0d.tar.gz
tcl-37387d61ef7f0429d0fc459901850838b6935f0d.tar.bz2
* unix/tclUnixPort.h: ensure MODULE_SCOPE is defined before use, so
that tclPort.h can once again be included without tclInt.h. * generic/tclEnv.c (Darwin): mark _environ symbol as unexported even when MODULE_SCOPE != __private_extern__.
-rw-r--r--ChangeLog8
-rw-r--r--generic/tclEnv.c4
-rw-r--r--unix/tclUnixPort.h6
3 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 61746e5..ce4bab1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-11-01 Daniel Steffen <das@users.sourceforge.net>
+
+ * unix/tclUnixPort.h: ensure MODULE_SCOPE is defined before use, so
+ that tclPort.h can once again be included without tclInt.h.
+
+ * generic/tclEnv.c (Darwin): mark _environ symbol as unexported
+ even when MODULE_SCOPE != __private_extern__.
+
2006-10-31 Don Porter <dgp@users.sourceforge.net>
* generic/tclBasic.c: Refactored and renamed the routines
diff --git a/generic/tclEnv.c b/generic/tclEnv.c
index 812c2e4..12f4ab4 100644
--- a/generic/tclEnv.c
+++ b/generic/tclEnv.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclEnv.c,v 1.28 2005/11/27 02:33:49 das Exp $
+ * RCS: @(#) $Id: tclEnv.c,v 1.29 2006/10/31 22:24:39 das Exp $
*/
#include "tclInt.h"
@@ -43,7 +43,7 @@ static int environSize = 0; /* Non-zero means that the environ array was
#if defined(__APPLE__) && defined(__DYNAMIC__)
#include <crt_externs.h>
-MODULE_SCOPE char **environ;
+__private_extern__ char **environ;
char **environ = NULL;
#endif
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index 285533b..8472ec4 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -19,7 +19,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclUnixPort.h,v 1.54 2006/09/07 09:17:33 vasiljevic Exp $
+ * RCS: @(#) $Id: tclUnixPort.h,v 1.55 2006/10/31 22:24:39 das Exp $
*/
#ifndef _TCLUNIXPORT
@@ -663,6 +663,10 @@ EXTERN int pthread_getattr_np _ANSI_ARGS_((pthread_t, pthread_attr_t *));
#include <pwd.h>
#include <grp.h>
+#ifndef MODULE_SCOPE
+#define MODULE_SCOPE extern
+#endif
+
MODULE_SCOPE struct passwd* TclpGetPwNam(const char *name);
MODULE_SCOPE struct group* TclpGetGrNam(const char *name);
MODULE_SCOPE struct passwd* TclpGetPwUid(uid_t uid);