[or-cvs] Forward-port SGI Compatibility patches from Jan Schaumann

[Nick Mathewson]

Update of /home/or/cvsroot/tor/src/common
In directory moria.mit.edu:/tmp/cvs-serv6576/src/common

Modified Files:
	compat.c compat.h 
Log Message:
Forward-port SGI Compatibility patches from Jan Schaumann

Index: compat.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/common/compat.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- compat.c	3 Feb 2005 06:40:06 -0000	1.31
+++ compat.c	3 Feb 2005 19:59:10 -0000	1.32
@@ -774,6 +774,7 @@
 }
 #else
 struct tor_mutex_t {
+  int _unused;
 };
 tor_mutex_t *tor_mutex_new(void) { return NULL; }
 void tor_mutex_acquire(tor_mutex_t *m) { }

Index: compat.h
===================================================================
RCS file: /home/or/cvsroot/tor/src/common/compat.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- compat.h	27 Jan 2005 22:34:48 -0000	1.19
+++ compat.h	3 Feb 2005 19:59:10 -0000	1.20
@@ -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. */