Fixed FTBFS with g++7 caused by #include directive placed inside namespace.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 1a41c9e42a)
r14.0.x
Michele Calgaro 7 years ago
parent 8f88b82b29
commit 8999284fae

@ -28,6 +28,7 @@
#ifdef HAVE_LIBPTHREAD #ifdef HAVE_LIBPTHREAD
#include <gsl/gslconfig.h> #include <gsl/gslconfig.h>
#include <gsl/gslcommon.h>
#include <sys/types.h> #include <sys/types.h>
#include <stddef.h> #include <stddef.h>
@ -36,7 +37,6 @@
#include <semaphore.h> #include <semaphore.h>
#include <debug.h> #include <debug.h>
#include <string.h> #include <string.h>
#include "thread.h" #include "thread.h"
/* /*
@ -332,7 +332,6 @@ public:
} }
} initOnStartup; } initOnStartup;
#include <gsl/gslcommon.h>
/* -fast- locking for gsl on platforms with unix98 support */ /* -fast- locking for gsl on platforms with unix98 support */
#if (GSL_HAVE_MUTEXATTR_SETTYPE > 0) #if (GSL_HAVE_MUTEXATTR_SETTYPE > 0)
static void pth_mutex_init (GslMutex *mutex) static void pth_mutex_init (GslMutex *mutex)

Loading…
Cancel
Save