ws2_32-getaddrinfo: Rebase against upstream changes.

This commit is contained in:
Sebastian Lackner
2015-01-20 23:04:35 +01:00
parent 372c004139
commit ddbbcb6c0f
2 changed files with 14 additions and 12 deletions

View File

@@ -446,7 +446,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
UINT height;
UINT width;
@@ -5019,7 +5064,11 @@
@@ -5016,7 +5061,11 @@
void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
{
@@ -9521,7 +9521,7 @@ diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -5193,9 +5193,15 @@
@@ -5205,9 +5205,15 @@
DebugBreak();
}