glx: minor cosmetic in glcontextmodes.c

move memory macros to separate block and unwrap malloc/free for miniglx towards
cleaning Mesa core glitches in glx...
This commit is contained in:
George Sapountzis 2007-04-05 19:00:47 +03:00
parent 885111518e
commit aa1c79eaea

View file

@ -31,21 +31,25 @@
* \author Ian Romanick <idr@us.ibm.com>
*/
#if defined(IN_MINI_GLX)
#include <GL/gl.h>
#else
#if defined(HAVE_DIX_CONFIG_H)
# include <dix-config.h>
#endif
#include <X11/X.h>
#include <GL/glx.h>
#include "GL/glxint.h"
#endif
/* Memory macros */
#if defined(IN_MINI_GLX)
# include <stdlib.h>
# include <string.h>
# include <GL/gl.h>
# include "GL/internal/dri_interface.h"
# include "imports.h"
# define _mesa_malloc(b) malloc(b)
# define _mesa_free(m) free(m)
# define _mesa_memset memset
#else
# if defined(HAVE_DIX_CONFIG_H)
# include <dix-config.h>
# endif
# include <X11/X.h>
# include <GL/glx.h>
# include "GL/glxint.h"
# ifdef XFree86Server
# include <os.h>
# include <string.h>