From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 3 Feb 2005 19:59:10 +0000 (+0000)
Subject: Forward-port SGI Compatibility patches from Jan Schaumann
X-Git-Tag: tor-0.1.0.1-rc~324
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e4b21c97f7ee21c5fb6c8bf6bac3133b2a7c22b9;p=thirdparty%2Ftor.git

Forward-port SGI Compatibility patches from Jan Schaumann


svn:r3517
---

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. */