[vlc-commits] Define WIN32_LEAN_AND_MEAN in config.h rather than vlc_common.h

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jan 28 16:56:58 2012 +0200| [dd648be95a997cf5ac78cf72db96bc1416c900f2] | committer: Rémi Denis-Courmont

Define WIN32_LEAN_AND_MEAN in config.h rather than vlc_common.h

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dd648be95a997cf5ac78cf72db96bc1416c900f2
---

 configure.ac         |    1 +
 include/vlc_common.h |    3 ---
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index dc11ac0..4e8792a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,7 @@ AC_DEFINE([_FILE_OFFSET_BITS], 64, [Define to 64 for large files support.])
 AC_DEFINE([_REENTRANT],, [Define to expose reentrant functions.])
 AC_DEFINE([_THREAD_SAFE],, [Same as _REENTANT for some other OSes.])
 AC_DEFINE([__LIBVLC__],, [Define within the LibVLC source code tree.])
+AC_DEFINE([WIN32_LEAN_AND_MEAN],, [Define to limit the scope of <windows.h>.])
 
 AM_PROG_CC_C_O
 AC_PROG_CXX
diff --git a/include/vlc_common.h b/include/vlc_common.h
index ac4b713..545b1cd 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -449,9 +449,6 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
  * OS-specific headers and thread types
  *****************************************************************************/
 #if defined( WIN32 ) || defined( UNDER_CE )
-/* WIN32_LEAN_AND_MEAN is needed to be able to include winsock2.h because else,
- * windows.h will also include winsock.h and declarations will conflict */
-# define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 #endif