diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-04-30 12:52:16 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-04-30 12:52:16 -0400 |
| commit | c03a233faae20d1766fb8f249cccb130b29891d2 (patch) | |
| tree | 85e70896ae406484af0e80bd0a3af6c2b2c1de0b | |
| parent | 6156403237fc1775a55000af5b792a5bb1b6e0f3 (diff) | |
| download | tor-c03a233faae20d1766fb8f249cccb130b29891d2.tar.gz tor-c03a233faae20d1766fb8f249cccb130b29891d2.zip | |
Remove __ from HAVE_EXTERN_ENVIRON_DECLARED__
I think that the trailing __ got added in false analogy to
HAVE_MACRO__func__, HAVE_MACRO__FUNC__, and HAVE_MACRO__FUNCTION__.
But those macros actually indicate the presence of __func__,
__FUNC__, and __FUNCTION__ respectively. The __ at the end of
HAVE_EXTERN_ENVIRON_DECLARED would only be appropriate if the
environ were declared__, whatever that means.
(As a side-note, HAVE_MACRO__func__ and so on should probably be
renamed HAVE_MACRO___func__ and so on. But that can wait.)
This is an identifier renaming only.
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | src/common/compat.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in index d4ea6c6d15..ede2087972 100644 --- a/configure.in +++ b/configure.in @@ -1138,7 +1138,7 @@ if test "$tor_cv_have_FUNCTION_macro" = 'yes'; then fi if test "$tor_cv_have_environ_declared" = 'yes'; then - AC_DEFINE(HAVE_EXTERN_ENVIRON_DECLARED__, 1, + AC_DEFINE(HAVE_EXTERN_ENVIRON_DECLARED, 1, [Defined if we have extern char **environ already declared]) fi diff --git a/src/common/compat.c b/src/common/compat.c index 0e8d144f56..fbb37ce031 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1712,7 +1712,7 @@ make_path_absolute(char *fname) } #ifndef HAVE__NSGETENVIRON -#ifndef HAVE_EXTERN_ENVIRON_DECLARED__ +#ifndef HAVE_EXTERN_ENVIRON_DECLARED /* Some platforms declare environ under some circumstances, others don't. */ extern char **environ; #endif |