From d99de60e6c88e5f6157b1d5c9b25cfd5d08a1c9a Mon Sep 17 00:00:00 2001
From: Alan Mishchenko <alanmi@berkeley.edu>
Date: Sun, 13 Feb 2011 13:40:21 -0800
Subject: Portability changes to the st package.

---
 src/misc/st/stmm.h | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'src/misc/st/stmm.h')

diff --git a/src/misc/st/stmm.h b/src/misc/st/stmm.h
index c23c6942..7d2e3f3a 100644
--- a/src/misc/st/stmm.h
+++ b/src/misc/st/stmm.h
@@ -17,9 +17,25 @@
 
 #include "extra.h"
 
+ABC_NAMESPACE_HEADER_START
 
 
-ABC_NAMESPACE_HEADER_START
+/* These are potential duplicates. */
+#ifndef EXTERN
+#   ifdef __cplusplus
+#       ifdef ABC_NAMESPACE
+#           define EXTERN extern
+#       else
+#           define EXTERN extern "C"
+#       endif
+#   else
+#       define EXTERN extern
+#   endif
+#endif
+
+#ifndef ARGS
+#define ARGS(protos) protos
+#endif
 
 typedef int (*stmm_compare_func_type)(const char*, const char*);
 typedef int (*stmm_hash_func_type)(const char*, int);
-- 
cgit v1.2.3