Mesa (master): vdpau: Fix include style

Brian Paul brianp at kemper.freedesktop.org
Mon Aug 29 07:12:04 PDT 2011


Module: Mesa
Branch: master
Commit: 28f8ff6b622d63e8ffe322ab2cdf5197941f1a40
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=28f8ff6b622d63e8ffe322ab2cdf5197941f1a40

Author: Kai Wasserbäch <kai at dev.carbon-project.org>
Date:   Sat Aug 27 17:51:55 2011 +0200

vdpau: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai at dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp at vmware.com>

---

 src/gallium/state_trackers/vdpau/decode.c        |    6 +++---
 src/gallium/state_trackers/vdpau/device.c        |    8 ++++----
 src/gallium/state_trackers/vdpau/htab.c          |    4 ++--
 src/gallium/state_trackers/vdpau/mixer.c         |    6 +++---
 src/gallium/state_trackers/vdpau/output.c        |    6 +++---
 src/gallium/state_trackers/vdpau/presentation.c  |    4 ++--
 src/gallium/state_trackers/vdpau/query.c         |   11 ++++++-----
 src/gallium/state_trackers/vdpau/surface.c       |    8 ++++----
 src/gallium/state_trackers/vdpau/vdpau_private.h |   10 +++++-----
 9 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/src/gallium/state_trackers/vdpau/decode.c b/src/gallium/state_trackers/vdpau/decode.c
index 50d63ea..2bf782e 100644
--- a/src/gallium/state_trackers/vdpau/decode.c
+++ b/src/gallium/state_trackers/vdpau/decode.c
@@ -25,9 +25,9 @@
  *
  **************************************************************************/
 
-#include <util/u_memory.h>
-#include <util/u_math.h>
-#include <util/u_debug.h>
+#include "util/u_memory.h"
+#include "util/u_math.h"
+#include "util/u_debug.h"
 
 #include "vdpau_private.h"
 
diff --git a/src/gallium/state_trackers/vdpau/device.c b/src/gallium/state_trackers/vdpau/device.c
index 200d5f6..4fcce91 100644
--- a/src/gallium/state_trackers/vdpau/device.c
+++ b/src/gallium/state_trackers/vdpau/device.c
@@ -25,12 +25,12 @@
  *
  **************************************************************************/
 
-#include <pipe/p_compiler.h>
+#include "pipe/p_compiler.h"
 
-#include <util/u_memory.h>
-#include <util/u_debug.h>
+#include "util/u_memory.h"
+#include "util/u_debug.h"
 
-#include <vl_winsys.h>
+#include "vl_winsys.h"
 
 #include "vdpau_private.h"
 
diff --git a/src/gallium/state_trackers/vdpau/htab.c b/src/gallium/state_trackers/vdpau/htab.c
index 20f5a17..39ff7be 100644
--- a/src/gallium/state_trackers/vdpau/htab.c
+++ b/src/gallium/state_trackers/vdpau/htab.c
@@ -25,8 +25,8 @@
  *
  **************************************************************************/
 
-#include <util/u_handle_table.h>
-#include <os/os_thread.h>
+#include "util/u_handle_table.h"
+#include "os/os_thread.h"
 #include "vdpau_private.h"
 
 #ifdef VL_HANDLES
diff --git a/src/gallium/state_trackers/vdpau/mixer.c b/src/gallium/state_trackers/vdpau/mixer.c
index 5c3c6c6..202f6ae 100644
--- a/src/gallium/state_trackers/vdpau/mixer.c
+++ b/src/gallium/state_trackers/vdpau/mixer.c
@@ -27,10 +27,10 @@
 
 #include <vdpau/vdpau.h>
 
-#include <util/u_memory.h>
-#include <util/u_debug.h>
+#include "util/u_memory.h"
+#include "util/u_debug.h"
 
-#include <vl/vl_csc.h>
+#include "vl/vl_csc.h"
 
 #include "vdpau_private.h"
 
diff --git a/src/gallium/state_trackers/vdpau/output.c b/src/gallium/state_trackers/vdpau/output.c
index bc4b39a..332690f 100644
--- a/src/gallium/state_trackers/vdpau/output.c
+++ b/src/gallium/state_trackers/vdpau/output.c
@@ -28,9 +28,9 @@
 
 #include <vdpau/vdpau.h>
 
-#include <util/u_debug.h>
-#include <util/u_memory.h>
-#include <util/u_sampler.h>
+#include "util/u_debug.h"
+#include "util/u_memory.h"
+#include "util/u_sampler.h"
 
 #include "vdpau_private.h"
 
diff --git a/src/gallium/state_trackers/vdpau/presentation.c b/src/gallium/state_trackers/vdpau/presentation.c
index 7e324db..ccd4787 100644
--- a/src/gallium/state_trackers/vdpau/presentation.c
+++ b/src/gallium/state_trackers/vdpau/presentation.c
@@ -29,8 +29,8 @@
 
 #include <vdpau/vdpau.h>
 
-#include <util/u_debug.h>
-#include <util/u_memory.h>
+#include "util/u_debug.h"
+#include "util/u_memory.h"
 
 #include "vdpau_private.h"
 
diff --git a/src/gallium/state_trackers/vdpau/query.c b/src/gallium/state_trackers/vdpau/query.c
index ec17e59..8cb95ae 100644
--- a/src/gallium/state_trackers/vdpau/query.c
+++ b/src/gallium/state_trackers/vdpau/query.c
@@ -25,13 +25,14 @@
  *
  **************************************************************************/
 
-#include "vdpau_private.h"
-#include <vl_winsys.h>
 #include <assert.h>
-#include <pipe/p_screen.h>
-#include <pipe/p_defines.h>
 #include <math.h>
-#include <util/u_debug.h>
+
+#include "vdpau_private.h"
+#include "vl_winsys.h"
+#include "pipe/p_screen.h"
+#include "pipe/p_defines.h"
+#include "util/u_debug.h"
 
 
 VdpStatus
diff --git a/src/gallium/state_trackers/vdpau/surface.c b/src/gallium/state_trackers/vdpau/surface.c
index d3f6b5d..4f73c40 100644
--- a/src/gallium/state_trackers/vdpau/surface.c
+++ b/src/gallium/state_trackers/vdpau/surface.c
@@ -28,11 +28,11 @@
 
 #include <assert.h>
 
-#include <pipe/p_state.h>
+#include "pipe/p_state.h"
 
-#include <util/u_memory.h>
-#include <util/u_debug.h>
-#include <util/u_rect.h>
+#include "util/u_memory.h"
+#include "util/u_debug.h"
+#include "util/u_rect.h"
 
 #include "vdpau_private.h"
 
diff --git a/src/gallium/state_trackers/vdpau/vdpau_private.h b/src/gallium/state_trackers/vdpau/vdpau_private.h
index 5482eff..263e254 100644
--- a/src/gallium/state_trackers/vdpau/vdpau_private.h
+++ b/src/gallium/state_trackers/vdpau/vdpau_private.h
@@ -33,13 +33,13 @@
 #include <vdpau/vdpau.h>
 #include <vdpau/vdpau_x11.h>
 
-#include <pipe/p_compiler.h>
-#include <pipe/p_video_decoder.h>
+#include "pipe/p_compiler.h"
+#include "pipe/p_video_decoder.h"
 
-#include <util/u_debug.h>
-#include <vl/vl_compositor.h>
+#include "util/u_debug.h"
+#include "vl/vl_compositor.h"
 
-#include <vl_winsys.h>
+#include "vl_winsys.h"
 
 #define INFORMATION G3DVL VDPAU Driver Shared Library version VER_MAJOR.VER_MINOR
 #define QUOTEME(x) #x



More information about the mesa-commit mailing list