* Move some inclusions to the main header.
* Remove inclusions and definitions that already exist in the main header.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61715
This commit is contained in:
Amine Khaldi 2014-01-20 11:18:23 +00:00
parent fc4f9522de
commit 7799255500
5 changed files with 19 additions and 50 deletions

View file

@ -18,18 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "config.h"
#include "wine/debug.h"
#define COBJMACROS
#include "winbase.h"
#include "wingdi.h"
#include "d3dxof_private.h" #include "d3dxof_private.h"
#include "dxfile.h"
#include <stdio.h>
WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);
WINE_DECLARE_DEBUG_CHANNEL(d3dxof_dump); WINE_DECLARE_DEBUG_CHANNEL(d3dxof_dump);

View file

@ -21,14 +21,21 @@
#ifndef __D3DXOF_PRIVATE_INCLUDED__ #ifndef __D3DXOF_PRIVATE_INCLUDED__
#define __D3DXOF_PRIVATE_INCLUDED__ #define __D3DXOF_PRIVATE_INCLUDED__
#include <stdarg.h> #include <config.h>
#include "windef.h" #include <stdio.h>
#include "winbase.h"
#include "wtypes.h" #define WIN32_NO_STATUS
#include "wingdi.h" #define _INC_WINDOWS
#include "winuser.h" #define COM_NO_WINDOWS_H
#include "dxfile.h"
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
#include <dxfile.h>
#include <wine/debug.h>
#define MAX_NAME_LEN 40 #define MAX_NAME_LEN 40
#define MAX_ARRAY_DIM 4 #define MAX_ARRAY_DIM 4

View file

@ -18,25 +18,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <stdarg.h>
#include <string.h>
#define COBJMACROS
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "winreg.h"
#include "winerror.h"
#include "ole2.h"
#include "rpcproxy.h"
#include "uuids.h"
#include "d3dxof_private.h" #include "d3dxof_private.h"
#include "dxfile.h"
#include "wine/debug.h" #include <rpcproxy.h>
WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);

View file

@ -23,13 +23,13 @@
#include <stdarg.h> #include <stdarg.h>
#include "windef.h" #include <windef.h>
#include "winbase.h" #include <winbase.h>
#include "wine/debug.h"
#include "mszip.h" #include "mszip.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);
THOSE_ZIP_CONSTS; THOSE_ZIP_CONSTS;

View file

@ -18,18 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "config.h"
#include "wine/debug.h"
#define COBJMACROS
#include "winbase.h"
#include "wingdi.h"
#include "d3dxof_private.h" #include "d3dxof_private.h"
#include "dxfile.h"
#include <stdio.h>
WINE_DEFAULT_DEBUG_CHANNEL(d3dxof_parsing); WINE_DEFAULT_DEBUG_CHANNEL(d3dxof_parsing);