rearranged order of some functions

[mesa.git] / src / mesa / main / glheader.h

diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index f4930cb01feb49d270d23b53a32c6c19737f9379..6a6eeab023798f219c687d4c66ee5355100afe70 100644 (file)
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -1,10 +1,10 @@
-/* $Id: glheader.h,v 1.1 1999/11/11 01:22:26 brianp Exp $ */
+/* $Id: glheader.h,v 1.6 2000/02/24 15:12:05 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
  *
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  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"),
@@ -47,19 +47,65 @@
 #else
 #include <assert.h>
 #include <ctype.h>
-#include <float.h>
 #include <math.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #endif
+#include <float.h>
+
 
 #ifdef HAVE_CONFIG_H
 #include "conf.h"
 #endif
 
-#include <GL/gl.h>
+#include "GL/gl.h"
+#include "GL/glext.h"
+
+
+/*
+ * Put compiler/OS/assembly pragmas and macros here to avoid
+ * cluttering other source files.
+ */
+
+
+/* Disable unreachable code warnings for Watcom C++ */
+#ifdef __WATCOMC__
+#pragma disable_message(201)
+#endif
+
+
+/* Turn off macro checking systems used by other libraries */
+#ifdef CHECK
+#undef CHECK
+#endif
+
 
+/* Create a macro so that asm functions can be linked into compilers other
+ * than GNU C
+ */
+#ifndef _ASMAPI
+#if !defined( __GNUC__ ) && !defined( VMS )
+#define _ASMAPI __cdecl
+#else
+#define _ASMAPI
+#endif
+#ifdef PTR_DECL_IN_FRONT
+#define        _ASMAPIP * _ASMAPI
+#else
+#define        _ASMAPIP _ASMAPI *
+#endif
+#endif
 
+#ifdef USE_X86_ASM
+#define _NORMAPI _ASMAPI
+#define _NORMAPIP _ASMAPIP
+#else
+#define _NORMAPI
+#define _NORMAPIP *
 #endif
+
+
+
+#endif /* GLHEADER_H */