diff options
-rw-r--r-- | src/include/gluos.h | 6 | ||||
-rw-r--r-- | src/libtess/geom.c | 2 | ||||
-rw-r--r-- | src/libtess/mesh.c | 4 | ||||
-rw-r--r-- | src/libtess/normal.c | 4 | ||||
-rw-r--r-- | src/libtess/priorityq-heap.c | 22 | ||||
-rw-r--r-- | src/libtess/priorityq.c | 2 | ||||
-rw-r--r-- | src/libtess/render.c | 8 | ||||
-rw-r--r-- | src/libtess/sweep.c | 4 | ||||
-rw-r--r-- | src/libtess/tess.c | 4 | ||||
-rw-r--r-- | src/libutil/mipmap.c | 6 |
10 files changed, 45 insertions, 17 deletions
diff --git a/src/include/gluos.h b/src/include/gluos.h index 8eaa7a1..802aa84 100644 --- a/src/include/gluos.h +++ b/src/include/gluos.h @@ -40,7 +40,9 @@ #define NOIME #define NOMINMAX -#define _WIN32_WINNT 0x0400 +#ifndef _WIN32_WINNT + #define _WIN32_WINNT 0x0400 +#endif #ifndef STRICT #define STRICT 1 #endif @@ -48,9 +50,11 @@ #include <windows.h> /* Disable warnings */ +#if defined(_MSC_VER) #pragma warning(disable : 4101) #pragma warning(disable : 4244) #pragma warning(disable : 4761) +#endif #if defined(_MSC_VER) && _MSC_VER >= 1200 && _MSC_VER < 1300 #pragma comment(linker, "/OPT:NOWIN98") diff --git a/src/libtess/geom.c b/src/libtess/geom.c index 7d3b8d8..35b36a3 100644 --- a/src/libtess/geom.c +++ b/src/libtess/geom.c @@ -198,7 +198,7 @@ printf("*********************%d\n",RandomInterpolate); #endif -#define Swap(a,b) if (1) { GLUvertex *t = a; a = b; b = t; } else +#define Swap(a,b) do { GLUvertex *t = a; a = b; b = t; } while (0) void __gl_edgeIntersect( GLUvertex *o1, GLUvertex *d1, GLUvertex *o2, GLUvertex *d2, diff --git a/src/libtess/mesh.c b/src/libtess/mesh.c index 95f87cd..36cb3a7 100644 --- a/src/libtess/mesh.c +++ b/src/libtess/mesh.c @@ -38,8 +38,12 @@ #include "mesh.h" #include "memalloc.h" +#ifndef TRUE #define TRUE 1 +#endif +#ifndef FALSE #define FALSE 0 +#endif static GLUvertex *allocVertex() { diff --git a/src/libtess/normal.c b/src/libtess/normal.c index 7ab8316..9a3bd43 100644 --- a/src/libtess/normal.c +++ b/src/libtess/normal.c @@ -39,8 +39,12 @@ #include <math.h> #include <assert.h> +#ifndef TRUE #define TRUE 1 +#endif +#ifndef FALSE #define FALSE 0 +#endif #define Dot(u,v) (u[0]*v[0] + u[1]*v[1] + u[2]*v[2]) diff --git a/src/libtess/priorityq-heap.c b/src/libtess/priorityq-heap.c index e3a6c60..52698b5 100644 --- a/src/libtess/priorityq-heap.c +++ b/src/libtess/priorityq-heap.c @@ -39,8 +39,12 @@ #define INIT_SIZE 32 +#ifndef TRUE #define TRUE 1 +#endif +#ifndef FALSE #define FALSE 0 +#endif #ifdef FOR_TRITE_TEST_PROGRAM #define LEQ(x,y) (*pq->leq)(x,y) @@ -159,7 +163,7 @@ void pqInit( PriorityQ *pq ) PQhandle pqInsert( PriorityQ *pq, PQkey keyNew ) { long curr; - PQhandle free; + PQhandle free_handle; curr = ++ pq->size; if( (curr*2) > pq->max ) { @@ -186,21 +190,21 @@ PQhandle pqInsert( PriorityQ *pq, PQkey keyNew ) } if( pq->freeList == 0 ) { - free = curr; + free_handle = curr; } else { - free = pq->freeList; - pq->freeList = pq->handles[free].node; + free_handle = pq->freeList; + pq->freeList = pq->handles[free_handle].node; } - pq->nodes[curr].handle = free; - pq->handles[free].node = curr; - pq->handles[free].key = keyNew; + pq->nodes[curr].handle = free_handle; + pq->handles[free_handle].node = curr; + pq->handles[free_handle].key = keyNew; if( pq->initialized ) { FloatUp( pq, curr ); } - assert(free != LONG_MAX); - return free; + assert(free_handle != LONG_MAX); + return free_handle; } /* really __gl_pqHeapExtractMin */ diff --git a/src/libtess/priorityq.c b/src/libtess/priorityq.c index 11f0263..c6b99cc 100644 --- a/src/libtess/priorityq.c +++ b/src/libtess/priorityq.c @@ -85,7 +85,7 @@ void pqDeletePriorityQ( PriorityQ *pq ) #define LT(x,y) (! LEQ(y,x)) #define GT(x,y) (! LEQ(x,y)) -#define Swap(a,b) if(1){PQkey *tmp = *a; *a = *b; *b = tmp;}else +#define Swap(a,b) do{PQkey *tmp = *a; *a = *b; *b = tmp;}while(0) /* really __gl_pqSortInit */ int pqInit( PriorityQ *pq ) diff --git a/src/libtess/render.c b/src/libtess/render.c index 4f376f7..bca836f 100644 --- a/src/libtess/render.c +++ b/src/libtess/render.c @@ -39,8 +39,12 @@ #include "tess.h" #include "render.h" +#ifndef TRUE #define TRUE 1 +#endif +#ifndef FALSE #define FALSE 0 +#endif /* This structure remembers the information we need about a primitive * to be able to render it later, once we have determined which @@ -143,11 +147,11 @@ static void RenderMaximumFaceGroup( GLUtesselator *tess, GLUface *fOrig ) #define AddToTrail(f,t) ((f)->trail = (t), (t) = (f), (f)->marked = TRUE) -#define FreeTrail(t) if( 1 ) { \ +#define FreeTrail(t) do { \ while( (t) != NULL ) { \ (t)->marked = FALSE; t = (t)->trail; \ } \ - } else /* absorb trailing semicolon */ + } while(0) /* absorb trailing semicolon */ diff --git a/src/libtess/sweep.c b/src/libtess/sweep.c index 744be6b..eca828f 100644 --- a/src/libtess/sweep.c +++ b/src/libtess/sweep.c @@ -46,8 +46,12 @@ #include "memalloc.h" #include "sweep.h" +#ifndef TRUE #define TRUE 1 +#endif +#ifndef FALSE #define FALSE 0 +#endif #ifdef FOR_TRITE_TEST_PROGRAM extern void DebugEvent( GLUtesselator *tess ); diff --git a/src/libtess/tess.c b/src/libtess/tess.c index 029a02c..4a0e8de 100644 --- a/src/libtess/tess.c +++ b/src/libtess/tess.c @@ -47,8 +47,12 @@ #define GLU_TESS_DEFAULT_TOLERANCE 0.0 #define GLU_TESS_MESH 100112 /* void (*)(GLUmesh *mesh) */ +#ifndef TRUE #define TRUE 1 +#endif +#ifndef FALSE #define FALSE 0 +#endif /*ARGSUSED*/ static void GLAPIENTRY noBegin( GLenum type ) {} /*ARGSUSED*/ static void GLAPIENTRY noEdgeFlag( GLboolean boundaryEdge ) {} diff --git a/src/libutil/mipmap.c b/src/libutil/mipmap.c index 8e63eaa..71e76af 100644 --- a/src/libutil/mipmap.c +++ b/src/libutil/mipmap.c @@ -5552,7 +5552,7 @@ static void shove233rev(const GLfloat shoveComponents[], static void extract565(int isSwap, const void *packedPixel, GLfloat extractComponents[]) { - GLushort ushort= *(const GLushort *)packedPixel; + GLushort ushort; if (isSwap) { ushort= __GLU_SWAP_2_BYTES(packedPixel); @@ -5593,7 +5593,7 @@ static void shove565(const GLfloat shoveComponents[], static void extract565rev(int isSwap, const void *packedPixel, GLfloat extractComponents[]) { - GLushort ushort= *(const GLushort *)packedPixel; + GLushort ushort; if (isSwap) { ushort= __GLU_SWAP_2_BYTES(packedPixel); @@ -6631,7 +6631,7 @@ static TexImage3Dproc pTexImage3D = 0; # include <dlfcn.h> # include <sys/types.h> #else - WINGDIAPI PROC WINAPI wglGetProcAddress(LPCSTR); +# include <windows.h> #endif static void gluTexImage3D( GLenum target, GLint level, |