From: Chad Versace <chad.versace@linux.intel.com>
Date: Sun, 2 Dec 2012 01:03:59 +0000 (-0800)
Subject: dri: Fix i965 build
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e5f1f8d52e6bfdf087f930425eb5092f52a29940;p=mesa.git

dri: Fix i965 build

The following commit broke the i965 build:

    commit 4a486f8bf2ca3d88228f8313282289abe78bc2f8
    Author: Marek Olšák <maraeo@gmail.com>
    Date:   Fri Nov 23 18:31:42 2012 +0100

    glx/dri2: add and use new driver hook flush_with_flags

That commit added a forward declaration of enum __DRI2throttleReason to
dri_interface.h. C++ 98 does not allow forward declarations of enums.

The fix: Move the enum's definition to earlier in the file.

Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
---

diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index 718b53beb88..568581d5b09 100644
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -272,7 +272,11 @@ struct __DRItexBufferExtensionRec {
 #define __DRI2_FLUSH_DRAWABLE (1 << 0) /* the drawable should be flushed. */
 #define __DRI2_FLUSH_CONTEXT  (1 << 1) /* glFlush should be called */
 
-enum __DRI2throttleReason;
+enum __DRI2throttleReason {
+   __DRI2_THROTTLE_SWAPBUFFER,
+   __DRI2_THROTTLE_COPYSUBBUFFER,
+   __DRI2_THROTTLE_FLUSHFRONT
+};
 
 struct __DRI2flushExtensionRec {
     __DRIextension base;
@@ -319,12 +323,6 @@ struct __DRI2flushExtensionRec {
 #define __DRI2_THROTTLE "DRI2_Throttle"
 #define __DRI2_THROTTLE_VERSION 1
 
-enum __DRI2throttleReason {
-   __DRI2_THROTTLE_SWAPBUFFER,
-   __DRI2_THROTTLE_COPYSUBBUFFER,
-   __DRI2_THROTTLE_FLUSHFRONT
-};
-
 struct __DRI2throttleExtensionRec {
    __DRIextension base;
    void (*throttle)(__DRIcontext *ctx,