Alexandre Julliard : qcap: Include system headers before Windows headers.

Alexandre Julliard julliard at winehq.org
Tue Sep 6 11:35:52 CDT 2011


Module: wine
Branch: master
Commit: b870cd1a162e84accbce1255be2394915214c0bf
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b870cd1a162e84accbce1255be2394915214c0bf

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Sep  6 12:12:05 2011 +0200

qcap: Include system headers before Windows headers.

---

 dlls/qcap/v4l.c |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c
index fadcd49..a7995e2 100644
--- a/dlls/qcap/v4l.c
+++ b/dlls/qcap/v4l.c
@@ -24,29 +24,14 @@
 
 #include "config.h"
 #include "wine/port.h"
-#include "wine/library.h"
 
 #define NONAMELESSSTRUCT
 #define NONAMELESSUNION
 #define COBJMACROS
 
 #include <stdarg.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wtypes.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "dshow.h"
-#include "vfwmsgs.h"
-#include "amvideo.h"
-#include "wine/debug.h"
-
-#include "capture.h"
-#include "qcap_main.h"
-
 #include <stdio.h>
 #include <fcntl.h>
-
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
@@ -69,6 +54,20 @@
 #include <unistd.h>
 #endif
 
+#include "windef.h"
+#include "winbase.h"
+#include "wtypes.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "dshow.h"
+#include "vfwmsgs.h"
+#include "amvideo.h"
+#include "wine/debug.h"
+#include "wine/library.h"
+
+#include "capture.h"
+#include "qcap_main.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(qcap_v4l);
 
 #ifdef HAVE_LINUX_VIDEODEV_H




More information about the wine-cvs mailing list