From dd7f735f5318735752c2c82d33eb7fb9148c5348 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 5 Dec 2003 00:46:06 +0000 Subject: [PATCH] don't include GL/gl.h, define GLAPIENTRYP if not defined --- src/mesa/glapi/glapitable.h | 4 +++- src/mesa/glapi/gltable.py | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h index 305f71c28dd..044c62cffe7 100644 --- a/src/mesa/glapi/glapitable.h +++ b/src/mesa/glapi/glapitable.h @@ -2,7 +2,9 @@ #ifndef _GLAPI_TABLE_H_ #define _GLAPI_TABLE_H_ -#include +#ifndef GLAPIENTRYP +#define GLAPIENTRYP +#endif struct _glapi_table { diff --git a/src/mesa/glapi/gltable.py b/src/mesa/glapi/gltable.py index 8bd885f4696..dfa9d0e3570 100644 --- a/src/mesa/glapi/gltable.py +++ b/src/mesa/glapi/gltable.py @@ -2,9 +2,9 @@ # Mesa 3-D graphics library -# Version: 4.1 +# Version: 5.1 # -# Copyright (C) 1999-2001 Brian Paul All Rights Reserved. +# Copyright (C) 1999-2003 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"), @@ -27,7 +27,7 @@ # Generate the glapitable.h file. # # Usage: -# gloffsets.py >glapitable.h +# python gloffsets.py >glapitable.h # # Dependencies: # The apispec file must be in the current directory. @@ -41,7 +41,9 @@ def PrintHead(): print '#ifndef _GLAPI_TABLE_H_' print '#define _GLAPI_TABLE_H_' print '' - print '#include ' + print '#ifndef GLAPIENTRYP' + print '#define GLAPIENTRYP' + print '#endif' print '' print 'struct _glapi_table' print '{' -- 2.30.2