Here is another one, it took me 5-7 min to do, and I
also rearranged the includes nicely...
ChangeLog
Remove non-standard header includes from imagehlp.h
Index: include/imagehlp.h
===================================================================
RCS file: /var/cvs/wine/include/imagehlp.h,v
retrieving revision 1.18
diff -u -r1.18 imagehlp.h
--- include/imagehlp.h 28 Aug 2003 21:43:35 -0000 1.18
+++ include/imagehlp.h 4 Sep 2003 03:11:35 -0000
@@ -21,8 +21,7 @@
#ifndef __WINE_IMAGEHLP_H
#define __WINE_IMAGEHLP_H
-#include <windef.h>
-#include <winbase.h>
+/* #include <wintrust.h> */
#ifdef __cplusplus
extern "C" {
Index: dlls/imagehlp/access.c
===================================================================
RCS file: /var/cvs/wine/dlls/imagehlp/access.c,v
retrieving revision 1.17
diff -u -r1.17 access.c
--- dlls/imagehlp/access.c 19 Aug 2003 00:57:29 -0000 1.17
+++ dlls/imagehlp/access.c 4 Sep 2003 03:07:29 -0000
@@ -19,12 +19,14 @@
*/
#include <string.h>
+
+#include "windef.h"
#include "winbase.h"
#include "winnt.h"
#include "winerror.h"
-#include "windef.h"
-#include "wine/debug.h"
#include "imagehlp.h"
+
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(imagehlp);
Index: dlls/imagehlp/debug.c
===================================================================
RCS file: /var/cvs/wine/dlls/imagehlp/debug.c,v
retrieving revision 1.10
diff -u -r1.10 debug.c
--- dlls/imagehlp/debug.c 14 Jan 2003 23:43:42 -0000 1.10
+++ dlls/imagehlp/debug.c 4 Sep 2003 03:07:44 -0000
@@ -18,11 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "winerror.h"
-#include "winbase.h"
#include "windef.h"
-#include "wine/debug.h"
+#include "winbase.h"
+#include "winerror.h"
#include "imagehlp.h"
+
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(imagehlp);
Index: dlls/imagehlp/imagehlp_main.c
===================================================================
RCS file: /var/cvs/wine/dlls/imagehlp/imagehlp_main.c,v
retrieving revision 1.14
diff -u -r1.14 imagehlp_main.c
--- dlls/imagehlp/imagehlp_main.c 30 Jun 2003 20:53:49 -0000 1.14
+++ dlls/imagehlp/imagehlp_main.c 4 Sep 2003 03:08:03 -0000
@@ -18,10 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "imagehlp.h"
-#include "winerror.h"
-#include "winbase.h"
#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "imagehlp.h"
+
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(imagehlp);
Index: dlls/imagehlp/integrity.c
===================================================================
RCS file: /var/cvs/wine/dlls/imagehlp/integrity.c,v
retrieving revision 1.10
diff -u -r1.10 integrity.c
--- dlls/imagehlp/integrity.c 22 Oct 2002 00:45:27 -0000 1.10
+++ dlls/imagehlp/integrity.c 4 Sep 2003 03:08:14 -0000
@@ -22,6 +22,7 @@
#include "winbase.h"
#include "winerror.h"
#include "imagehlp.h"
+
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(imagehlp);
Index: dlls/imagehlp/internal.c
===================================================================
RCS file: /var/cvs/wine/dlls/imagehlp/internal.c,v
retrieving revision 1.8
diff -u -r1.8 internal.c
--- dlls/imagehlp/internal.c 31 May 2002 23:25:47 -0000 1.8
+++ dlls/imagehlp/internal.c 4 Sep 2003 03:08:29 -0000
@@ -18,11 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
-#include "windef.h"
-#include "wine/debug.h"
#include "imagehlp.h"
+
+#include "wine/debug.h"
/***********************************************************************
* InitializeListHead
Index: dlls/imagehlp/modify.c
===================================================================
RCS file: /var/cvs/wine/dlls/imagehlp/modify.c,v
retrieving revision 1.11
diff -u -r1.11 modify.c
--- dlls/imagehlp/modify.c 31 May 2002 23:25:47 -0000 1.11
+++ dlls/imagehlp/modify.c 4 Sep 2003 03:08:47 -0000
@@ -18,11 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
-#include "windef.h"
-#include "wine/debug.h"
#include "imagehlp.h"
+
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(imagehlp);
Index: dlls/imagehlp/symbol.c
===================================================================
RCS file: /var/cvs/wine/dlls/imagehlp/symbol.c,v
retrieving revision 1.11
diff -u -r1.11 symbol.c
--- dlls/imagehlp/symbol.c 22 Oct 2002 00:45:27 -0000 1.11
+++ dlls/imagehlp/symbol.c 4 Sep 2003 03:09:03 -0000
@@ -18,11 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
-#include "windef.h"
-#include "wine/debug.h"
#include "imagehlp.h"
+
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(imagehlp);
--
Dimi.
