diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-04-11 00:46:11 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-04-11 00:46:11 +0000 |
| commit | aafd8b6031e66e0b2f727197c1d1d040036ec0a8 (patch) | |
| tree | 0d3a10efb4527c9af6dd6e1ba0bb03e4acf143dd /src/Fl_win32.cxx | |
| parent | 84122ac25acc8bbfbdc54c0384a859d6ad43a475 (diff) | |
Fix VisualC++ build (Visual Studio 2015).
IDE generated with CMake, still many warnings, but compiles and runs.
Note: we *must* get rid of all VisualStudio-specific #define's like:
#define unlink _unlink
This one led to a compilation error (not a warning).
src/Fl_File_Icon.cxx: I had to add _MSC_VER (WIN32) distinction as in
previous code (FLTK 1.3). Obviously MinGW is more Unixy than MS VC++
since MinGW compiled and linked the code. Needs a better fix ...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11580 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_win32.cxx')
| -rw-r--r-- | src/Fl_win32.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index 02cf80637..9a2e8ffb0 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -20,7 +20,7 @@ // in. Search other files for "WIN32" or filenames ending in _win32.cxx // for other system-specific code. -#if defined(WIN32) and !defined(FL_DOXYGEN) +#if defined(WIN32) && !defined(FL_DOXYGEN) /* We require Windows 2000 features (e.g. VK definitions) */ # if !defined(WINVER) || (WINVER < 0x0500) |