build: check for solaris pthreads, which mess up macros.

also check for posix_memalign() and memalign().
finnoon · Oct 18, 2013 · 7393ca6 · 7393ca6
1 parent 505d133
commit 7393ca6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/bson/bson-context.c b/bson/bson-context.c
@@ -269,7 +269,21 @@ bson_context_init_default (void)
 bson_context_t *
 bson_context_get_default (void)
 {
+   /*
+    * TODO: This should be done in our thread abstraction.
+    */
+
+#ifdef SOLARIS_PTHREADS
+   /*
+    * How lovely of solaris (and I think Irix) to do this to posix
+    * macros. Ugh.
+    */
+   static pthread_once_t once = {PTHREAD_ONCE_INIT};
+#else
    static pthread_once_t once = PTHREAD_ONCE_INIT;
+#endif
+
    pthread_once(&once, bson_context_init_default);
+
    return gContextDefault;
 }
diff --git a/configure.ac b/configure.ac
@@ -86,6 +86,7 @@ AS_CASE([$host],
 	[*-*-solaris*],
 	[
 		platform_solaris=yes
+		CFLAGS="$CFLAGS -DSOLARIS_PTHREADS"
 	],
 
 	[]