From 105652ad09fa4898d2fadd791802406c3f1afbec Mon Sep 17 00:00:00 2001
From: John Emmas <johne53@tiscali.co.uk>
Date: Wed, 17 Jul 2013 08:06:26 +0100
Subject: Accommodate 'pthread-win32' and 'boost/regex' (for libpbd)

---
 libs/pbd/debug_rt_alloc.c | 3 ++-
 libs/pbd/localtime_r.cc   | 2 +-
 libs/pbd/pathexpand.cc    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'libs')

diff --git a/libs/pbd/debug_rt_alloc.c b/libs/pbd/debug_rt_alloc.c
index 81e640b66d..7e578a2367 100644
--- a/libs/pbd/debug_rt_alloc.c
+++ b/libs/pbd/debug_rt_alloc.c
@@ -22,9 +22,10 @@
 #define _GNU_SOURCE
 #include <dlfcn.h>
 #include <stdio.h>
-#include <pthread.h>
 #include <stdlib.h>
 
+#include "pbd/pthread_utils.h"
+
 int (*pbd_alloc_allowed) () = 0;
 
 /** Thread-local key whose value is set to 1 if malloc checking is disabled
diff --git a/libs/pbd/localtime_r.cc b/libs/pbd/localtime_r.cc
index 26e9dcc4a4..c72e3eb458 100644
--- a/libs/pbd/localtime_r.cc
+++ b/libs/pbd/localtime_r.cc
@@ -5,8 +5,8 @@
 #ifndef HAVE_LOCALTIME_R
 #include <time.h>
 #include <string.h>
-#include <pthread.h>
 
+#include "pbd/pthread_utils.h"
 #include "pbd/localtime_r.h"
 
 #ifdef localtime_r
diff --git a/libs/pbd/pathexpand.cc b/libs/pbd/pathexpand.cc
index 5c3a0f8bcf..ae3bed4599 100644
--- a/libs/pbd/pathexpand.cc
+++ b/libs/pbd/pathexpand.cc
@@ -23,7 +23,7 @@
 #include <cerrno>
 #include <cstdlib>
 
-#include <regex.h>
+#include <boost/regex.h>
 
 #include <glibmm/miscutils.h>
 
-- 
cgit v1.2.3