mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Added patch to avoid duplicate definition of REFERENCE_TIME.
This commit is contained in:
parent
2c08a980e8
commit
986a011548
@ -0,0 +1,27 @@
|
||||
From 607d3969a3b2633ce4dd4f99f96d1666c15cd98d Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sun, 15 Jan 2017 22:52:09 +0100
|
||||
Subject: include: Avoid duplicate definition of REFERENCE_TIME.
|
||||
|
||||
---
|
||||
include/dmdls.h | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/include/dmdls.h b/include/dmdls.h
|
||||
index b40ef88bf8d..ea7dcf00946 100644
|
||||
--- a/include/dmdls.h
|
||||
+++ b/include/dmdls.h
|
||||
@@ -30,7 +30,10 @@ typedef LONG PCENT;
|
||||
typedef LONG PERCENT;
|
||||
typedef LONG TCENT;
|
||||
|
||||
+#ifndef REFERENCE_TIME_DEFINED
|
||||
+#define REFERENCE_TIME_DEFINED
|
||||
typedef LONGLONG REFERENCE_TIME, *LPREFERENCE_TIME;
|
||||
+#endif
|
||||
|
||||
/*****************************************************************************
|
||||
* FOURCC definition
|
||||
--
|
||||
2.11.0
|
||||
|
1
patches/include-Duplicate_Typedef/definition
Normal file
1
patches/include-Duplicate_Typedef/definition
Normal file
@ -0,0 +1 @@
|
||||
Fixes: [42211] Avoid duplicate definition of REFERENCE_TIME
|
@ -170,6 +170,7 @@ patch_enable_all ()
|
||||
enable_imagehlp_Cleanup="$1"
|
||||
enable_imagehlp_ImageLoad="$1"
|
||||
enable_imm32_IMMDisableLegacyIME="$1"
|
||||
enable_include_Duplicate_Typedef="$1"
|
||||
enable_inseng_Implementation="$1"
|
||||
enable_iphlpapi_System_Ping="$1"
|
||||
enable_iphlpapi_TCP_Table="$1"
|
||||
@ -721,6 +722,9 @@ patch_enable ()
|
||||
imm32-IMMDisableLegacyIME)
|
||||
enable_imm32_IMMDisableLegacyIME="$2"
|
||||
;;
|
||||
include-Duplicate_Typedef)
|
||||
enable_include_Duplicate_Typedef="$2"
|
||||
;;
|
||||
inseng-Implementation)
|
||||
enable_inseng_Implementation="$2"
|
||||
;;
|
||||
@ -4398,6 +4402,21 @@ if test "$enable_imm32_IMMDisableLegacyIME" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset include-Duplicate_Typedef
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#42211] Avoid duplicate definition of REFERENCE_TIME
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * include/dmdls.h
|
||||
# |
|
||||
if test "$enable_include_Duplicate_Typedef" -eq 1; then
|
||||
patch_apply include-Duplicate_Typedef/0001-include-Avoid-duplicate-definition-of-REFERENCE_TIME.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "include: Avoid duplicate definition of REFERENCE_TIME.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset inseng-Implementation
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
Loading…
x
Reference in New Issue
Block a user