Mercurial > hg > octave-nkf

changeset 13721:ca90a6d59ab6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Prevent auto-inclusion of winsock.h in WIN32. * DLD-FUNCTIONS/__fltk_uigetfile__.cc: Define WIN32_LEAN_AND_MEAN. * DLD-FUNCTIONS/__init_fltk__.cc: Likewise.
author Michael Goffioul <michael.goffioul@gmail.com>
date Wed, 19 Oct 2011 12:11:40 +0100
parents 8fb563d14d2f
children ecff4c684b89
files src/DLD-FUNCTIONS/__fltk_uigetfile__.cc src/DLD-FUNCTIONS/__init_fltk__.cc
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/__fltk_uigetfile__.cc
+++ b/src/DLD-FUNCTIONS/__fltk_uigetfile__.cc
@@ -26,6 +26,10 @@
 
 #if defined (HAVE_FLTK)
 
+#ifdef WIN32
+#define WIN32_LEAN_AND_MEAN
+#endif
+
 #include <FL/Fl.H>
 #include <FL/Fl_File_Chooser.H>
 
--- a/src/DLD-FUNCTIONS/__init_fltk__.cc
+++ b/src/DLD-FUNCTIONS/__init_fltk__.cc
@@ -40,6 +40,10 @@
 #include <sstream>
 #include <iostream>
 
+#ifdef WIN32
+#define WIN32_LEAN_AND_MEAN
+#endif
+
 #include <FL/Fl.H>
 #include <FL/Fl_Box.H>
 #include <FL/Fl_Button.H>