mesa: fix merge conflict (in comment)

[mesa.git] / src / mesa / main / api_loopback.h

diff --git a/src/mesa/main/api_loopback.h b/src/mesa/main/api_loopback.h
index 1c8e81733f55b34c6e416622b7e574386bd09fb2..6f85bbc1d92e7c3d2ce3aabfe1dc6db5b6797e38 100644 (file)
--- a/src/mesa/main/api_loopback.h
+++ b/src/mesa/main/api_loopback.h
@@ -1,14 +1,37 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+
 #ifndef API_LOOPBACK_H
 #define API_LOOPBACK_H
 
 #include "glheader.h"
 
-struct _glapi_table;
 
-extern void _mesa_loopback_prefer_float( struct _glapi_table *dest, 
-                                        GLboolean prefer_float_colors );
+struct _glapi_table;
 
-extern void _mesa_loopback_init_api_table( struct _glapi_table *dest, 
-                                          GLboolean prefer_float_colors );
+extern void _mesa_loopback_init_api_table( struct _glapi_table *dest );
 
 #endif