Forward-port SGI Compatibility patches from Jan Schaumann

svn:r3517

diff --git a/src/common/compat.c b/src/common/compat.c
index ae1b58653a82be3bcb287bb70dbeb11f9425ac43..fa30cd87399b50d35595c8f9733b67baaf442dc1 100644 (file)
--- 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 f75e39b12245d34178881a7edb4dd36d6f3e3346..d1b5c80aed3f45206cabb4aed45f44742d970fc9 100644 (file)
--- 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. */