diff options
| author | Nick Mathewson <nickm@torproject.org> | 2005-02-03 19:59:10 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2005-02-03 19:59:10 +0000 |
| commit | e4b21c97f7ee21c5fb6c8bf6bac3133b2a7c22b9 (patch) | |
| tree | 2dbda96dc0f7c1717c74b03baf3acf4cf99958d4 | |
| parent | cd39e4fc62852c5665a0b0cc77202b23e2590804 (diff) | |
| download | tor-e4b21c97f7ee21c5fb6c8bf6bac3133b2a7c22b9.tar.gz tor-e4b21c97f7ee21c5fb6c8bf6bac3133b2a7c22b9.zip | |
Forward-port SGI Compatibility patches from Jan Schaumann
svn:r3517
| -rw-r--r-- | src/common/compat.c | 1 | ||||
| -rw-r--r-- | src/common/compat.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/common/compat.c b/src/common/compat.c index ae1b58653a..fa30cd8739 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -774,6 +774,7 @@ void tor_mutex_free(tor_mutex_t *m) } #else struct tor_mutex_t { + int _unused; }; tor_mutex_t *tor_mutex_new(void) { return NULL; } void tor_mutex_acquire(tor_mutex_t *m) { } diff --git a/src/common/compat.h b/src/common/compat.h index f75e39b122..d1b5c80aed 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -53,6 +53,10 @@ #define __FUNCTION__ "???" #endif +#if defined(__sgi) && !defined(__GNUC__) && defined(__c99) +#define __FUNCTION__ __func__ +#endif + /* ===== String compatibility */ #ifdef MS_WINDOWS /* Windows names string functions differently from most other platforms. */ |