diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2017-10-15 10:46:16 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2017-10-15 10:46:16 +0000 |
| commit | a8b58f6b79da340030d0646ba7036ba40f62e528 (patch) | |
| tree | db1f3b6ed1dafbffa33ac6f50cb61cdc3d3fad92 /test/demo.cxx | |
| parent | 1af23ab32f55b7b5f6bc00840d0f8faa70102cec (diff) | |
Replace inappropriate usage of __WATCOM__ with _MSC_VER.
Note: this is in parts temporary since some of the functions redefined
for Visual Studio will be replaced with fl_*() functions in later commits.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12498 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'test/demo.cxx')
| -rw-r--r-- | test/demo.cxx | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/test/demo.cxx b/test/demo.cxx index 6ba07b543..16376f9b5 100644 --- a/test/demo.cxx +++ b/test/demo.cxx @@ -3,7 +3,7 @@ // // Main demo program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2010 by Bill Spitzak and others. +// Copyright 1998-2017 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -19,14 +19,20 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#if defined(WIN32) && !defined(__CYGWIN__) -# include <direct.h> -# ifndef __WATCOMC__ -// Visual C++ 2005 incorrectly displays a warning about the use of POSIX APIs -// on Windows, which is supposed to be POSIX compliant... + +// *FIXME* Implement fl_chdir() and fl_putenv() ! +// *FIXME* Check whether directory related headers can be removed (i.e. not +// *FIXME* included) if fl_chdir() is implemented and called in demo.cxx + +// Visual C++ 2005 incorrectly displays a warning about the use of +// POSIX APIs on Windows, which is supposed to be POSIX compliant... +# if defined(_MSC_VER) # define chdir _chdir # define putenv _putenv -# endif // !__WATCOMC__ +# endif // _MSC_VER + +#if defined(WIN32) && !defined(__CYGWIN__) +# include <direct.h> #elif defined __APPLE__ #include <ApplicationServices/ApplicationServices.h> #include <unistd.h> // for chdir() |