Fix compiler warnings in multiple patches.

This commit is contained in:
Sebastian Lackner
2016-07-31 03:02:56 +02:00
parent 9f334d5964
commit 3ddc7bcaff
7 changed files with 95 additions and 87 deletions

View File

@@ -1,16 +1,16 @@
From d88860b3dd92769f14c45c92f9640ee4a9e8efe8 Mon Sep 17 00:00:00 2001
From d19a6f79481387bd7d65895c31fd861f1658aca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 14 Dec 2014 20:42:45 +0100
Subject: winecfg: Add staging tab for CSMT.
---
programs/winecfg/Makefile.in | 1 +
programs/winecfg/main.c | 12 +++++-
programs/winecfg/main.c | 12 ++++++-
programs/winecfg/resource.h | 5 +++
programs/winecfg/staging.c | 89 ++++++++++++++++++++++++++++++++++++++++++++
programs/winecfg/staging.c | 86 ++++++++++++++++++++++++++++++++++++++++++++
programs/winecfg/winecfg.h | 1 +
programs/winecfg/winecfg.rc | 10 +++++
6 files changed, 117 insertions(+), 1 deletion(-)
programs/winecfg/winecfg.rc | 10 ++++++
6 files changed, 114 insertions(+), 1 deletion(-)
create mode 100644 programs/winecfg/staging.c
diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in
@@ -87,10 +87,10 @@ index 0c0b038..54c67c2 100644
#define IDC_ABT_ORG 8433
diff --git a/programs/winecfg/staging.c b/programs/winecfg/staging.c
new file mode 100644
index 0000000..09c0d3f
index 0000000..0aed083
--- /dev/null
+++ b/programs/winecfg/staging.c
@@ -0,0 +1,89 @@
@@ -0,0 +1,86 @@
+/*
+ * WineCfg Staging panel
+ *
@@ -119,13 +119,10 @@ index 0000000..09c0d3f
+
+#include <windows.h>
+#include <wine/unicode.h>
+#include <wine/debug.h>
+
+#include "resource.h"
+#include "winecfg.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(winecfg);
+
+/*
+ * Command stream multithreading
+ */
@@ -221,5 +218,5 @@ index 72c3e1b..dedc039 100644
/* @makedep: winecfg.ico */
--
2.7.1
2.9.0