* Corrected #include "thread.h" => #include "wx/thread.h"
* Corrected the joystick.h detection stuff in configure.in git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
2
install/gtk/configure
vendored
2
install/gtk/configure
vendored
@@ -2712,7 +2712,7 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
GTK_JOYSTICK=""
|
GTK_JOYSTICK=""
|
||||||
if test "$ac_cv_header_linux_joystick_h" != ""; then
|
if test "$ac_cv_header_linux_joystick_h" = "yes"; then
|
||||||
GTK_JOYSTICK="gtk/joystick.cpp"
|
GTK_JOYSTICK="gtk/joystick.cpp"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@@ -422,7 +422,7 @@ dnl defines HAVE_UNISTD_H
|
|||||||
dnl As it needs Linux 2.1.x for the moment: check whether the file exists (GL).
|
dnl As it needs Linux 2.1.x for the moment: check whether the file exists (GL).
|
||||||
AC_CHECK_HEADER(linux/joystick.h)
|
AC_CHECK_HEADER(linux/joystick.h)
|
||||||
GTK_JOYSTICK=""
|
GTK_JOYSTICK=""
|
||||||
if test "$ac_cv_header_linux_joystick_h" != ""; then
|
if test "$ac_cv_header_linux_joystick_h" = "yes"; then
|
||||||
GTK_JOYSTICK="gtk/joystick.cpp"
|
GTK_JOYSTICK="gtk/joystick.cpp"
|
||||||
fi
|
fi
|
||||||
AC_SUBST(GTK_JOYSTICK)
|
AC_SUBST(GTK_JOYSTICK)
|
||||||
|
@@ -13,6 +13,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/wx.h"
|
#include "wx/wx.h"
|
||||||
|
#include "wx/thread.h"
|
||||||
|
|
||||||
wxMutex::wxMutex()
|
wxMutex::wxMutex()
|
||||||
{
|
{
|
||||||
|
@@ -28,7 +28,7 @@ enum thread_state {
|
|||||||
// Static variables
|
// Static variables
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#include "thread.h"
|
#include "wx/thread.h"
|
||||||
|
|
||||||
static pthread_t p_mainid;
|
static pthread_t p_mainid;
|
||||||
wxMutex wxMainMutex; // controls access to all GUI functions
|
wxMutex wxMainMutex; // controls access to all GUI functions
|
||||||
|
@@ -30,6 +30,8 @@ enum thread_state {
|
|||||||
// Static variables
|
// Static variables
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
#include "wx/thread.h"
|
||||||
|
|
||||||
static int p_mainid;
|
static int p_mainid;
|
||||||
wxMutex wxMainMutex;
|
wxMutex wxMainMutex;
|
||||||
|
|
||||||
|
@@ -13,6 +13,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/wx.h"
|
#include "wx/wx.h"
|
||||||
|
#include "wx/thread.h"
|
||||||
|
|
||||||
wxMutex::wxMutex()
|
wxMutex::wxMutex()
|
||||||
{
|
{
|
||||||
|
@@ -28,7 +28,7 @@ enum thread_state {
|
|||||||
// Static variables
|
// Static variables
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#include "thread.h"
|
#include "wx/thread.h"
|
||||||
|
|
||||||
static pthread_t p_mainid;
|
static pthread_t p_mainid;
|
||||||
wxMutex wxMainMutex; // controls access to all GUI functions
|
wxMutex wxMainMutex; // controls access to all GUI functions
|
||||||
|
@@ -30,6 +30,8 @@ enum thread_state {
|
|||||||
// Static variables
|
// Static variables
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
#include "wx/thread.h"
|
||||||
|
|
||||||
static int p_mainid;
|
static int p_mainid;
|
||||||
wxMutex wxMainMutex;
|
wxMutex wxMainMutex;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user