From: erg Date: Tue, 4 Nov 2008 16:58:53 +0000 (+0000) Subject: Fix warnings; X-Git-Tag: LAST_LIBGRAPH~32^2~2892 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=900106a7d504a481ce545a12e96824ba4bcdc8d2;p=graphviz Fix warnings; fix #ifndef wrapper in .h file; use unsigned int --- diff --git a/lib/glcomp/glcomptexture.c b/lib/glcomp/glcomptexture.c index cbd147a08..6a7b5ccb5 100644 --- a/lib/glcomp/glcomptexture.c +++ b/lib/glcomp/glcomptexture.c @@ -14,6 +14,9 @@ **********************************************************/ #include "glcomptexture.h" +#ifndef _WIN32 +#include "stdlib.h" +#endif glCompTexture *glCompCreateTextureFromRaw(char *filename, int width, int height, int wrap) diff --git a/lib/glcomp/glcomptexture.h b/lib/glcomp/glcomptexture.h index 25bbd3d6a..d2b76368a 100644 --- a/lib/glcomp/glcomptexture.h +++ b/lib/glcomp/glcomptexture.h @@ -16,6 +16,10 @@ /*Open GL texture handling and storing mechanism includes glPanel,glCompButton,glCompCustomButton,clCompLabel,glCompStyle */ + +#ifndef GLCOMPTEXTURE_H +#define GLCOMPTEXTURE_H + #ifdef _WIN32 #include "windows.h" #endif @@ -23,10 +27,8 @@ #include #include -#ifndef GLCOMPTEXTURE_H -#define GLCOMPTEXTURE_H typedef struct { - int id; + unsigned int id; float w, h; } glCompTexture;