walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[win] Consolidate windows.h include tips and tricks

This commit is contained in:
Behdad Esfahbod 2014-07-19 16:32:04 -04:00
parent f26d59d468
commit db30828048
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hb-atomic-private.hh
View File

@ -44,10 +44,6 @@
#elif !defined(HB_NO_MT) && (defined(_WIN32) || defined(__CYGWIN__)) #elif !defined(HB_NO_MT) && (defined(_WIN32) || defined(__CYGWIN__))
#define WIN32_LEAN_AND_MEAN
#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0600
#endif
#include <windows.h> #include <windows.h>
/* MinGW has a convoluted history of supporting MemoryBarrier /* MinGW has a convoluted history of supporting MemoryBarrier

1
src/hb-mutex-private.hh
View File

@ -44,7 +44,6 @@
#elif !defined(HB_NO_MT) && (defined(_WIN32) || defined(__CYGWIN__)) #elif !defined(HB_NO_MT) && (defined(_WIN32) || defined(__CYGWIN__))
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
typedef CRITICAL_SECTION hb_mutex_impl_t; typedef CRITICAL_SECTION hb_mutex_impl_t;
#define HB_MUTEX_IMPL_INIT { NULL, 0, 0, NULL, NULL, 0 } #define HB_MUTEX_IMPL_INIT { NULL, 0, 0, NULL, NULL, 0 }

12
src/hb-private.hh
View File

@ -116,6 +116,18 @@
#define HB_FUNC __func__ #define HB_FUNC __func__
#endif #endif
#ifdef _WIN32
/* We need Windows Vista for both Uniscribe backend and for
* MemoryBarrier. We don't support compiling on Windows XP,
* though we run on it fine. */
# if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600
# undef _WIN32_WINNT
# endif
# ifndef _WIN32_WINNT
# define _WIN32_WINNT 0x0600
# endif
# define WIN32_LEAN_AND_MEAN
#endif
/* Basics */ /* Basics */

3
src/hb-uniscribe.cc
View File

@ -24,9 +24,6 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#define _WIN32_WINNT 0x0600
#define WIN32_LEAN_AND_MEAN
#define HB_SHAPER uniscribe #define HB_SHAPER uniscribe
#include "hb-shaper-impl-private.hh" #include "hb-shaper-impl-private.hh"

3
src/hb-uniscribe.h
View File

@ -29,9 +29,6 @@
#include "hb.h" #include "hb.h"
#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0600
#endif
#include <windows.h> #include <windows.h>
HB_BEGIN_DECLS HB_BEGIN_DECLS