Merge commit 'origin/gallium-0.1' into gallium-0.2

[mesa.git] / src / mesa / drivers / dri / swrast / swrast_priv.h

diff --git a/src/mesa/drivers/dri/swrast/swrast_priv.h b/src/mesa/drivers/dri/swrast/swrast_priv.h
index a3e3922f128755bf2e322af9318c0de7a74c42df..a707ffc40a88f5c203f0f6e463a0e88538962419 100644 (file)
--- a/src/mesa/drivers/dri/swrast/swrast_priv.h
+++ b/src/mesa/drivers/dri/swrast/swrast_priv.h
@@ -33,7 +33,7 @@
 
 #include <GL/gl.h>
 #include <GL/internal/dri_interface.h>
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
 /**
@@ -92,19 +92,19 @@ struct swrast_renderbuffer {
     GLuint pitch;
 };
 
-static inline __DRIcontext *
+static INLINE __DRIcontext *
 swrast_context(GLcontext *ctx)
 {
     return (__DRIcontext *) ctx;
 }
 
-static inline __DRIdrawable *
+static INLINE __DRIdrawable *
 swrast_drawable(GLframebuffer *fb)
 {
     return (__DRIdrawable *) fb;
 }
 
-static inline struct swrast_renderbuffer *
+static INLINE struct swrast_renderbuffer *
 swrast_renderbuffer(struct gl_renderbuffer *rb)
 {
     return (struct swrast_renderbuffer *) rb;