diff options
Diffstat (limited to 'src/mesa/swrast/s_points.h')
| -rw-r--r-- | src/mesa/swrast/s_points.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/swrast/s_points.h b/src/mesa/swrast/s_points.h index 3fda115c0df..a4fc53e2c01 100644 --- a/src/mesa/swrast/s_points.h +++ b/src/mesa/swrast/s_points.h @@ -27,7 +27,11 @@ #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 ); |