diff options
| author | Zou Nan hai <nanhai.zou@intel.com> | 2007-07-04 10:52:35 +0800 |
|---|---|---|
| committer | Zou Nan hai <nanhai.zou@intel.com> | 2007-07-04 10:52:35 +0800 |
| commit | fb9ee9b323bff93973a39560b2bc007aace4bddd (patch) | |
| tree | 05e1e72e8f4d321cde2c48b8518e6d9736c680dd /src/glu | |
| parent | 285b326c606e9b2f90e4fe177b15b3fa23239b86 (diff) | |
| parent | 7ff4359a3be1278b26950f96ab23014a667af838 (diff) | |
Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa into 965-glsl
Diffstat (limited to 'src/glu')
| -rw-r--r-- | src/glu/sgi/glu.def | 2 | ||||
| -rw-r--r-- | src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/glu/sgi/glu.def b/src/glu/sgi/glu.def index ffec651a0a..0c8b021767 100644 --- a/src/glu/sgi/glu.def +++ b/src/glu/sgi/glu.def @@ -1,4 +1,4 @@ -DESCRIPTION 'Mesa GLU (OpenGL work-alike) for Win32' +;DESCRIPTION 'Mesa GLU (OpenGL work-alike) for Win32' VERSION 5.1 ; ; Module definition file for GLU (GLU32.DLL) diff --git a/src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h b/src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h index 7ff7739434..002549ecbd 100644 --- a/src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h +++ b/src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h @@ -43,10 +43,9 @@ #include "definitions.h" #include "primitiveStream.h" #include "directedLine.h" +#include "arc.h" class Backend; -class Arc; -typedef Arc *Arc_ptr; class reflexChain{ Real2 *queue; |