Mesa (master): st/xorg: Fix include style

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


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

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

st/xorg: 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/xorg/xorg_exa.h         |    2 +-
 src/gallium/state_trackers/xorg/xvmc/attributes.c  |    2 +-
 src/gallium/state_trackers/xorg/xvmc/block.c       |    2 +-
 src/gallium/state_trackers/xorg/xvmc/context.c     |   14 +++++++-------
 src/gallium/state_trackers/xorg/xvmc/subpicture.c  |   18 +++++++++---------
 src/gallium/state_trackers/xorg/xvmc/surface.c     |   14 +++++++-------
 .../state_trackers/xorg/xvmc/xvmc_private.h        |   10 +++++-----
 7 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/gallium/state_trackers/xorg/xorg_exa.h b/src/gallium/state_trackers/xorg/xorg_exa.h
index 30b6f0c..47501f9 100644
--- a/src/gallium/state_trackers/xorg/xorg_exa.h
+++ b/src/gallium/state_trackers/xorg/xorg_exa.h
@@ -3,7 +3,7 @@
 
 #include "xorg_tracker.h"
 
-#include <pipe/p_state.h>
+#include "pipe/p_state.h"
 
 struct cso_context;
 struct xorg_shaders;
diff --git a/src/gallium/state_trackers/xorg/xvmc/attributes.c b/src/gallium/state_trackers/xorg/xvmc/attributes.c
index 817af53..b115d52 100644
--- a/src/gallium/state_trackers/xorg/xvmc/attributes.c
+++ b/src/gallium/state_trackers/xorg/xvmc/attributes.c
@@ -32,7 +32,7 @@
 #include <X11/extensions/Xvlib.h>
 #include <X11/extensions/XvMClib.h>
 
-#include <vl/vl_compositor.h>
+#include "vl/vl_compositor.h"
 
 #include "xvmc_private.h"
 
diff --git a/src/gallium/state_trackers/xorg/xvmc/block.c b/src/gallium/state_trackers/xorg/xvmc/block.c
index 6b0b212..64f8497 100644
--- a/src/gallium/state_trackers/xorg/xvmc/block.c
+++ b/src/gallium/state_trackers/xorg/xvmc/block.c
@@ -30,7 +30,7 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/XvMClib.h>
 
-#include <util/u_memory.h>
+#include "util/u_memory.h"
 
 #include "xvmc_private.h"
 
diff --git a/src/gallium/state_trackers/xorg/xvmc/context.c b/src/gallium/state_trackers/xorg/xvmc/context.c
index f21ebda..172f16c 100644
--- a/src/gallium/state_trackers/xorg/xvmc/context.c
+++ b/src/gallium/state_trackers/xorg/xvmc/context.c
@@ -30,15 +30,15 @@
 #include <X11/Xlibint.h>
 #include <X11/extensions/XvMClib.h>
 
-#include <pipe/p_screen.h>
-#include <pipe/p_video_decoder.h>
-#include <pipe/p_video_state.h>
-#include <pipe/p_state.h>
+#include "pipe/p_screen.h"
+#include "pipe/p_video_decoder.h"
+#include "pipe/p_video_state.h"
+#include "pipe/p_state.h"
 
-#include <util/u_memory.h>
+#include "util/u_memory.h"
 
-#include <vl/vl_csc.h>
-#include <vl_winsys.h>
+#include "vl/vl_csc.h"
+#include "vl_winsys.h"
 
 #include "xvmc_private.h"
 
diff --git a/src/gallium/state_trackers/xorg/xvmc/subpicture.c b/src/gallium/state_trackers/xorg/xvmc/subpicture.c
index 7d6ff06..95a63c8 100644
--- a/src/gallium/state_trackers/xorg/xvmc/subpicture.c
+++ b/src/gallium/state_trackers/xorg/xvmc/subpicture.c
@@ -31,17 +31,17 @@
 #include <X11/extensions/XvMClib.h>
 #include <xorg/fourcc.h>
 
-#include <pipe/p_screen.h>
-#include <pipe/p_video_decoder.h>
-#include <pipe/p_state.h>
+#include "pipe/p_screen.h"
+#include "pipe/p_video_decoder.h"
+#include "pipe/p_state.h"
 
-#include <util/u_memory.h>
-#include <util/u_math.h>
-#include <util/u_format.h>
-#include <util/u_sampler.h>
-#include <util/u_rect.h>
+#include "util/u_memory.h"
+#include "util/u_math.h"
+#include "util/u_format.h"
+#include "util/u_sampler.h"
+#include "util/u_rect.h"
 
-#include <vl_winsys.h>
+#include "vl_winsys.h"
 
 #include "xvmc_private.h"
 
diff --git a/src/gallium/state_trackers/xorg/xvmc/surface.c b/src/gallium/state_trackers/xorg/xvmc/surface.c
index 79bd9c6..521bc42 100644
--- a/src/gallium/state_trackers/xorg/xvmc/surface.c
+++ b/src/gallium/state_trackers/xorg/xvmc/surface.c
@@ -30,15 +30,15 @@
 
 #include <X11/Xlibint.h>
 
-#include <pipe/p_video_decoder.h>
-#include <pipe/p_video_state.h>
-#include <pipe/p_state.h>
+#include "pipe/p_video_decoder.h"
+#include "pipe/p_video_state.h"
+#include "pipe/p_state.h"
 
-#include <util/u_inlines.h>
-#include <util/u_memory.h>
-#include <util/u_math.h>
+#include "util/u_inlines.h"
+#include "util/u_memory.h"
+#include "util/u_math.h"
 
-#include <vl_winsys.h>
+#include "vl_winsys.h"
 
 #include "xvmc_private.h"
 
diff --git a/src/gallium/state_trackers/xorg/xvmc/xvmc_private.h b/src/gallium/state_trackers/xorg/xvmc/xvmc_private.h
index fd14ac9..43ae717 100644
--- a/src/gallium/state_trackers/xorg/xvmc/xvmc_private.h
+++ b/src/gallium/state_trackers/xorg/xvmc/xvmc_private.h
@@ -31,13 +31,13 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/XvMClib.h>
 
-#include <pipe/p_video_state.h>
+#include "pipe/p_video_state.h"
 
-#include <util/u_debug.h>
-#include <util/u_math.h>
+#include "util/u_debug.h"
+#include "util/u_math.h"
 
-#include <vl/vl_csc.h>
-#include <vl/vl_compositor.h>
+#include "vl/vl_csc.h"
+#include "vl/vl_compositor.h"
 
 #define BLOCK_SIZE_SAMPLES 64
 #define BLOCK_SIZE_BYTES (BLOCK_SIZE_SAMPLES * 2)



More information about the mesa-commit mailing list