#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