mirror of https://github.com/CGAL/cgal
explicit casting of a parameter in pthread_start call
putting Xlib specific stuff (XInitThreads) in #ifdef
This commit is contained in:
parent
6f3579d41f
commit
04c6b10d93
|
|
@ -20,7 +20,7 @@
|
|||
// (Mariette Yvinec <Mariette.Yvinec@sophia.inria.fr>)
|
||||
//
|
||||
// ============================================================================
|
||||
#include <config.h> // fltk's config
|
||||
// #include <config.h> // fltk's config
|
||||
#include <FL/Fl.H> // order of includes is important on Windows.
|
||||
#include <FL/gl.h>
|
||||
#include <FL/Fl_Gl_Window.H>
|
||||
|
|
|
|||
|
|
@ -1094,7 +1094,7 @@ pthread_t Viewer_3::get_window_thread()
|
|||
|
||||
void Viewer_3::init_window_thread()
|
||||
{
|
||||
pthread_create(&thr1, NULL, &mainloop, this);
|
||||
pthread_create(&thr1, NULL, reinterpret_cast<void *(*)(void *)>(&mainloop), this);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -1107,7 +1107,9 @@ void Viewer_3::display()
|
|||
void Viewer_3::init_window()
|
||||
{
|
||||
#ifdef USE_THREAD
|
||||
#ifndef WIN32 // a temporary solution ?
|
||||
XInitThreads();
|
||||
#endif
|
||||
#endif
|
||||
form = new Fl_Window(size,size,"CGAL Viewer");
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue