Skip to content

Commit

Permalink
Meson: Define _WIN32_WINNT in the toplevel meson.build file
Browse files Browse the repository at this point in the history
  • Loading branch information
lb90 committed Oct 10, 2024
1 parent 4197585 commit a0c823e
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 27 deletions.
2 changes: 0 additions & 2 deletions gdk/win32/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ libgdk_win32 = static_library('gdk-win32',
'-DGTK_COMPILATION',
'-DG_LOG_DOMAIN="Gdk"',
'-DINSIDE_GDK_WIN32',
'-D_WIN32_WINNT=0x0601',
'-DWINVER=0x0601',
],
dependencies: [ gdk_deps, gdk_win32_deps ],
)
4 changes: 0 additions & 4 deletions gtk/gtkfilechoosernativewin32.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@

#include "config.h"

/* Vista or newer */
#define _WIN32_WINNT 0x0600
#include <sdkddkver.h>

#define COBJMACROS

#include "gtkfilechoosernativeprivate.h"
Expand Down
10 changes: 0 additions & 10 deletions gtk/print/gtkprint-win32.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,6 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/

#ifndef _MSC_VER
#ifndef _WIN32_WINNT
/* Vista or newer */
#define _WIN32_WINNT 0x0600
#endif
#ifndef WINVER
#define WINVER _WIN32_WINNT
#endif
#endif

#include "config.h"
#include "gtkprint-win32.h"

Expand Down
10 changes: 0 additions & 10 deletions gtk/print/gtkprintoperation-win32.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,6 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/

#ifndef _MSC_VER
#ifndef _WIN32_WINNT
/* Vista or newer */
#define _WIN32_WINNT 0x0600
#endif
#ifndef WINVER
#define WINVER _WIN32_WINNT
#endif
#endif

#define COBJMACROS
#include "config.h"
#include <math.h>
Expand Down
3 changes: 2 additions & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ add_project_arguments('-D_GNU_SOURCE', language: 'c')

if host_machine.system() == 'windows'
add_project_arguments(['-DUNICODE',
'-D_UNICODE'], language: 'c')
'-D_UNICODE',
'-D_WIN32_WINNT=_WIN32_WINNT_WIN7'], language: 'c')
endif

# Use debug/optimization flags to determine whether to enable debug or disable
Expand Down

0 comments on commit a0c823e

Please sign in to comment.