Author: akhaldi
Date: Sat Dec 21 16:44:34 2013
New Revision: 61324
URL:
http://svn.reactos.org/svn/reactos?rev=61324&view=rev
Log:
[D3DCOMPILER_43]
* Move some inclusions to the main header.
* Remove inclusions that already exist in the main header.
CORE-7716
Modified:
trunk/reactos/dll/directx/wine/d3dcompiler_43/asmparser.c
trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.c
trunk/reactos/dll/directx/wine/d3dcompiler_43/blob.c
trunk/reactos/dll/directx/wine/d3dcompiler_43/bytecodewriter.c
trunk/reactos/dll/directx/wine/d3dcompiler_43/compiler.c
trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c
trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h
trunk/reactos/dll/directx/wine/d3dcompiler_43/hlsl.tab.c
trunk/reactos/dll/directx/wine/d3dcompiler_43/reflection.c
trunk/reactos/dll/directx/wine/d3dcompiler_43/utils.c
Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/asmparser.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dcompiler_43/asmparser.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dcompiler_43/asmparser.c [iso-8859-1] Sat Dec 21
16:44:34 2013
@@ -19,10 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*
*/
-
-#include "config.h"
-#include "wine/port.h"
-#include "wine/debug.h"
#include "d3dcompiler_private.h"
Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.c [iso-8859-1] Sat Dec 21
16:44:34 2013
@@ -75,10 +75,6 @@
/* Line 268 of yacc.c */
#line 22 "asmshader.y"
-
-#include "config.h"
-#include "wine/port.h"
-#include "wine/debug.h"
#include "d3dcompiler_private.h"
Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/blob.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dcompiler_43/blob.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dcompiler_43/blob.c [iso-8859-1] Sat Dec 21 16:44:34
2013
@@ -19,9 +19,6 @@
*
*/
-#include "config.h"
-#include "wine/port.h"
-
#include "d3dcompiler_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler);
Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/bytecodewriter.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dcompiler_43/bytecodewriter.c [iso-8859-1]
(original)
+++ trunk/reactos/dll/directx/wine/d3dcompiler_43/bytecodewriter.c [iso-8859-1] Sat Dec 21
16:44:34 2013
@@ -20,12 +20,8 @@
*
*/
-#include "config.h"
-#include "wine/port.h"
-#include "wine/debug.h"
-
+#include "d3dcompiler_private.h"
#include "d3d9types.h"
-#include "d3dcompiler_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(bytecodewriter);
Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/compiler.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dcompiler_43/compiler.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dcompiler_43/compiler.c [iso-8859-1] Sat Dec 21
16:44:34 2013
@@ -17,13 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define COBJMACROS
-#include "config.h"
-#include "wine/port.h"
-#include "wine/debug.h"
+#include "d3dcompiler_private.h"
#include "wine/unicode.h"
-
-#include "d3dcompiler_private.h"
#include "wine/wpp.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler);
Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c [iso-8859-1]
(original)
+++ trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c [iso-8859-1] Sat
Dec 21 16:44:34 2013
@@ -19,13 +19,6 @@
*
*/
-#include "config.h"
-
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-
#include "d3dcompiler_private.h"
BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h [iso-8859-1]
(original)
+++ trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h [iso-8859-1] Sat
Dec 21 16:44:34 2013
@@ -22,16 +22,21 @@
#ifndef __WINE_D3DCOMPILER_PRIVATE_H
#define __WINE_D3DCOMPILER_PRIVATE_H
-#include "wine/debug.h"
-#include "wine/list.h"
-#include "wine/rbtree.h"
+#include <config.h>
+#include <wine/port.h>
+
+#include <stdio.h>
+
+#include <wine/debug.h>
+#include <wine/list.h>
+#include <wine/rbtree.h>
#define COBJMACROS
-#include "windef.h"
-#include "winbase.h"
-#include "objbase.h"
-
-#include "d3dcompiler.h"
+#include <windef.h>
+#include <winbase.h>
+#include <objbase.h>
+
+#include <d3dcompiler.h>
#include <assert.h>
Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/hlsl.tab.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dcompiler_43/hlsl.tab.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dcompiler_43/hlsl.tab.c [iso-8859-1] Sat Dec 21
16:44:34 2013
@@ -75,11 +75,6 @@
/* Line 268 of yacc.c */
#line 21 "hlsl.y"
-
-#include "config.h"
-#include "wine/debug.h"
-
-#include <stdio.h>
#include "d3dcompiler_private.h"
Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/reflection.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dcompiler_43/reflection.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dcompiler_43/reflection.c [iso-8859-1] Sat Dec 21
16:44:34 2013
@@ -17,9 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*
*/
-
-#include "config.h"
-#include "wine/port.h"
#include "d3dcompiler_private.h"
Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/utils.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dcompiler_43/utils.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dcompiler_43/utils.c [iso-8859-1] Sat Dec 21 16:44:34
2013
@@ -20,11 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*
*/
-
-#include "config.h"
-#include "wine/port.h"
-
-#include <stdio.h>
#include "d3dcompiler_private.h"