wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Removed several patches (accepted upstream).

Browse Source
This commit is contained in:
Sebastian Lackner
2014-10-01 21:54:28 +02:00
parent fb86960b4f
commit f2f8ea98c5
13 changed files with 20 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
patches/Miscellaneous/0005-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch
View File

@@ -1,16 +1,15 @@
From fec987aaff3478e5325df368cce471109fe3c064 Mon Sep 17 00:00:00 2001
From f56694f318ce0134317b812ff32f6c35875c31b3 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Fri, 8 Aug 2014 19:33:14 -0600
Subject: Appease the blessed version of gcc (4.5) when -Werror is enabled.
---
dlls/d3d9/tests/visual.c | 2 +-
dlls/netapi32/netapi32.c | 2 +-
dlls/winealsa.drv/mmdevdrv.c | 2 +-
dlls/wined3d/glsl_shader.c | 2 +-
server/object.c | 2 +-
tools/makedep.c | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
dlls/d3d9/tests/visual.c | 2 +-
dlls/netapi32/netapi32.c | 2 +-
dlls/winealsa.drv/mmdevdrv.c | 2 +-
dlls/wined3d/glsl_shader.c | 2 +-
tools/makedep.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index 117c8eb..3988628 100644
@@ -52,10 +51,10 @@ index a4c02bf..909db53 100644
static const WCHAR dashW[] = {' ','-',' ',0};
static const size_t dashW_len = (sizeof(dashW) / sizeof(*dashW)) - 1;
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 1097d87..38d6cbd 100644
index 34cc567..4f2a6c6 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -5798,7 +5798,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
@@ -5784,7 +5784,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
GLhandleARB vs_id = 0;
GLhandleARB gs_id = 0;
GLhandleARB ps_id = 0;
@@ -64,21 +63,8 @@ index 1097d87..38d6cbd 100644
if (!(context->shader_update_mask & (1 << WINED3D_SHADER_TYPE_VERTEX)))
{
diff --git a/server/object.c b/server/object.c
index 11ef0ce..133c6b5 100644
--- a/server/object.c
+++ b/server/object.c
@@ -428,7 +428,7 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd,
{
struct security_descriptor new_sd, *new_sd_ptr;
int present;
- const SID *owner, *group;
+ const SID *owner = NULL, *group = NULL;
const ACL *sacl, *dacl;
char *ptr;
diff --git a/tools/makedep.c b/tools/makedep.c
index 396a1e3..1261785 100644
index 54aab45..103422e 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -1480,7 +1480,7 @@ static char *get_make_variable( struct makefile *make, const char *name )
@@ -91,5 +77,5 @@ index 396a1e3..1261785 100644
expand = get_make_variable( make, name );
if (!expand) return NULL;
--
1.7.9.5
2.1.1