diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-12-14 21:02:24 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-12-14 21:02:24 +0000 |
| commit | 4ef0817b83113c7231e3866942d71708026d30d6 (patch) | |
| tree | e3a65fb98398d2e3fc4147e8329aef8e369b507c /test | |
| parent | 40750fb3528c4bec60ee1dfe4f6c06186bec39fd (diff) | |
Disable threading by default.
Remove 2.0 FL_API defines from threads.h, since that header is not part
of the library.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1848 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile | 6 | ||||
| -rw-r--r-- | test/threads.h | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/test/Makefile b/test/Makefile index 763e0f6f0..5522b67ca 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.19.2.7.2.20 2001/12/14 19:34:30 easysw Exp $" +# "$Id: Makefile,v 1.19.2.7.2.21 2001/12/14 21:02:24 easysw Exp $" # # Test/example program makefile for the Fast Light Tool Kit (FLTK). # @@ -136,7 +136,7 @@ ALL = \ subwindow$(EXEEXT) \ symbols$(EXEEXT) \ tabs$(EXEEXT) \ - threads$(EXEEXT) \ + $(THREADS) \ tile$(EXEEXT) \ tiled_image$(EXEEXT) \ valuators$(EXEEXT) @@ -253,5 +253,5 @@ uninstall: @echo Nothing to uninstall in test directory. # -# End of "$Id: Makefile,v 1.19.2.7.2.20 2001/12/14 19:34:30 easysw Exp $". +# End of "$Id: Makefile,v 1.19.2.7.2.21 2001/12/14 21:02:24 easysw Exp $". # diff --git a/test/threads.h b/test/threads.h index dd8197325..31230e8ef 100644 --- a/test/threads.h +++ b/test/threads.h @@ -1,5 +1,5 @@ // -// "$Id: threads.h,v 1.1.2.2 2001/12/09 20:26:24 easysw Exp $" +// "$Id: threads.h,v 1.1.2.3 2001/12/14 21:02:24 easysw Exp $" // // Simple threading API for the Fast Light Tool Kit (FLTK). // @@ -118,7 +118,7 @@ public: # endif -# else // Use Windows threading... +# elif defined(WIN32) // Use Windows threading... # include <windows.h> # include <process.h> @@ -129,7 +129,7 @@ static int fl_create_thread(Fl_Thread& t, void *(*f) (void *), void* p) { return t = (Fl_Thread)_beginthread((void( __cdecl * )( void * ))f, 0, p); } -class FL_API Fl_Mutex { +class Fl_Mutex { friend class Fl_SignalMutex; CRITICAL_SECTION cs; Fl_Mutex(const Fl_Mutex&); @@ -141,7 +141,7 @@ public: ~Fl_Mutex() {DeleteCriticalSection(&cs);} }; -class FL_API Fl_SignalMutex : public Fl_Mutex { +class Fl_SignalMutex : public Fl_Mutex { HANDLE event; public: Fl_SignalMutex() : Fl_Mutex() {event = CreateEvent(0, FALSE, FALSE, 0);} @@ -156,9 +156,9 @@ public: } }; -# endif // !WIN32 +# endif // !HAVE_PTHREAD_H #endif // !Threads_h // -// End of "$Id: threads.h,v 1.1.2.2 2001/12/09 20:26:24 easysw Exp $". +// End of "$Id: threads.h,v 1.1.2.3 2001/12/14 21:02:24 easysw Exp $". // |