X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fswrast%2Fs_points.h;h=0b6550e8018170cb3e145e86b52a5fae4ea36f5b;hb=1b3ec16cc2c1190f0212fda26242f5e5206f5b1e;hp=a4fc53e2c010e08f036f0653f2056976e6eeff2e;hpb=7513bc3886b69335e7976b2c9bbde8e928485818;p=mesa.git

diff --git a/src/mesa/swrast/s_points.h b/src/mesa/swrast/s_points.h
index a4fc53e2c01..0b6550e8018 100644
--- a/src/mesa/swrast/s_points.h
+++ b/src/mesa/swrast/s_points.h
@@ -27,17 +27,13 @@
 #ifndef S_POINTS_H
 #define S_POINTS_H
 
-<<<<<<< HEAD:src/mesa/swrast/s_points.h
-#include "main/mtypes.h"
-=======
 #include "swrast.h"
->>>>>>> master:src/mesa/swrast/s_points.h
 
 extern void
-_swrast_choose_point( GLcontext *ctx );
+_swrast_choose_point( struct gl_context *ctx );
 
 extern void
-_swrast_add_spec_terms_point( GLcontext *ctx,
+_swrast_add_spec_terms_point( struct gl_context *ctx,
 			      const SWvertex *v0 );
 
 #endif