From 32ad286d06998b3dfa09bb7a5bc2be21d9c633b3 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 12 Nov 2010 11:47:19 +0100
Subject: [PATCH] atl: Move atliface.idl to the global includes.

---
 .gitignore                         | 2 +-
 dlls/atl/Makefile.in               | 3 ---
 include/Makefile.in                | 1 +
 {dlls/atl => include}/atliface.idl | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)
 rename {dlls/atl => include}/atliface.idl (98%)

diff --git a/.gitignore b/.gitignore
index a340baf1648..6085e687202 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,7 +43,6 @@ dlls/actxprxy/actxprxy_urlhist.h
 dlls/actxprxy/actxprxy_urlhist_p.c
 dlls/advapi32/svcctl.h
 dlls/advapi32/svcctl_c.c
-dlls/atl/atliface.h
 dlls/d3dcompiler_43/asmshader.tab.c
 dlls/d3dcompiler_43/asmshader.tab.h
 dlls/d3dcompiler_43/asmshader.yy.c
@@ -150,6 +149,7 @@ include/activscp.h
 include/amstream.h
 include/amvideo.h
 include/asptlb.h
+include/atliface.h
 include/audioclient.h
 include/audiopolicy.h
 include/austream.h
diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in
index 05de265446d..a631ed82de0 100644
--- a/dlls/atl/Makefile.in
+++ b/dlls/atl/Makefile.in
@@ -9,7 +9,4 @@ C_SRCS = \
 
 RC_SRCS = rsrc.rc
 
-IDL_H_SRCS = \
-	atliface.idl
-
 @MAKE_DLL_RULES@
diff --git a/include/Makefile.in b/include/Makefile.in
index 3f4f9de223f..e7c75ee5509 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -9,6 +9,7 @@ PUBLIC_IDL_H_SRCS = \
 	amstream.idl \
 	amvideo.idl \
 	asptlb.idl \
+	atliface.idl \
 	audioclient.idl \
 	audiopolicy.idl \
 	austream.idl \
diff --git a/dlls/atl/atliface.idl b/include/atliface.idl
similarity index 98%
rename from dlls/atl/atliface.idl
rename to include/atliface.idl
index ef3e5e58165..f71bc3af8e4 100644
--- a/dlls/atl/atliface.idl
+++ b/include/atliface.idl
@@ -19,7 +19,7 @@
 import "ocidl.idl";
 
 cpp_quote("#ifdef ATL_INITGUID")
-cpp_quote("#include \"initguid.h\"")
+cpp_quote("#include <initguid.h>")
 cpp_quote("#endif")
 
 [