include readtex.h

diff --git a/progs/demos/drawpix.c b/progs/demos/drawpix.c
index faa98ee2fbf529eee3ba55b8960afbf9881f397c..82d32b0705c29b8a1204c81f7fe4d4bd06704ad9 100644 (file)
--- a/progs/demos/drawpix.c
+++ b/progs/demos/drawpix.c
@@ -8,9 +8,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
+#include <string.h>
 #include <GL/glut.h>
 
-#include "readtex.c"
+#include "readtex.h"
 
 #define IMAGE_FILE "../images/girl.rgb"
 

diff --git a/progs/demos/fogcoord.c b/progs/demos/fogcoord.c
index f4f8199efa58edf47dc48966c327fd4c0ff9cd97..19a15f05b87fe2d2c73ebe7a1e421a69a2d60657 100644 (file)
--- a/progs/demos/fogcoord.c
+++ b/progs/demos/fogcoord.c
@@ -13,7 +13,7 @@
 #include <math.h>
 #include <GL/glut.h>
 
-#include "readtex.c" /* the compulsory hack  */
+#include "readtex.h"
 
 #define TEXTURE_FILE "../images/bw.rgb"
 

diff --git a/progs/demos/multiarb.c b/progs/demos/multiarb.c
index 6fe35e7fdd21284c741bb26c25c665e53dc646d9..d963985c69de0012520a52de4a8eb2fb5e922a37 100644 (file)
--- a/progs/demos/multiarb.c
+++ b/progs/demos/multiarb.c
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <GL/glut.h>
 
-#include "readtex.c"   /* I know, this is a hack. */
+#include "readtex.h"
 
 #define TEXTURE_1_FILE "../images/girl.rgb"
 #define TEXTURE_2_FILE "../images/reflect.rgb"
@@ -36,7 +36,6 @@ static GLfloat drift_increment = 0.005;
 static GLfloat Xrot = 20.0, Yrot = 30.0, Zrot = 0.0;
 
 
-
 static void Idle( void )
 {
    if (Animate) {

diff --git a/progs/demos/readpix.c b/progs/demos/readpix.c
index 71ce9723543973f47df16a7100a6de683e93a845..2dc92f93fcd7ec766be3a45aa1ade91249eb3441 100644 (file)
--- a/progs/demos/readpix.c
+++ b/progs/demos/readpix.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
+#include <string.h>
 #include <GL/glut.h>
 
 #include "readtex.h"

diff --git a/progs/demos/teapot.c b/progs/demos/teapot.c
index 67a64f99373957c256d5689c077f58ba7e00b869..5a50447227e9a81846deae6cf807c40be5d5a53c 100644 (file)
--- a/progs/demos/teapot.c
+++ b/progs/demos/teapot.c
@@ -10,6 +10,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <time.h>
+#include <string.h>
 
 #ifdef WIN32
 #include <windows.h>