Merge 'tags/v0.5-971107': Added re-include protection.

src/modules/Image/colortable.h

 /*
 **! module Image
 **! note
-**!	$Id: colortable.h,v 1.7 1997/11/07 06:06:07 mirar Exp $
+**!	$Id: colortable.h,v 1.8 1997/11/09 15:39:39 grubba Exp $
 */
 
+#ifndef PIKE_IMAGE_COLORTABLE_H
+#define PIKE_IMAGE_COLORTABLE_H
+
+#ifndef PIKE_IMAGE_IMAGE_H
+#include "image.h"
+#endif /* !PIKE_IMAGE_IMAGE_H */
+
 #define COLORLOOKUPCACHEHASHSIZE 207
 
 typedef unsigned long nct_weight_t;
@@ -193,3 +200,5 @@ int image_colortable_map_image(struct neo_colortable *nct,
 			       rgb_group *d,
 			       int len,
 			       int rowlen);
+
+#endif /* PIKE_IMAGE_COLORTABLE_H */

src/modules/Image/image.h

-/* $Id: image.h,v 1.11 1997/11/07 06:06:12 mirar Exp $ */
+/* $Id: image.h,v 1.12 1997/11/09 15:39:40 grubba Exp $ */
+
+#ifndef PIKE_IMAGE_IMAGE_H
+#define PIKE_IMAGE_IMAGE_H
 
 /*
 **! module Image
 **! note
-**!	$Id: image.h,v 1.11 1997/11/07 06:06:12 mirar Exp $
+**!	$Id: image.h,v 1.12 1997/11/09 15:39:40 grubba Exp $
 */
 
 #define MAX_NUMCOL 32768
@@ -134,3 +137,4 @@ void image_tobitmap(INT32 args);
 
 void image_polygone(INT32 args);
 
+#endif /* PIKE_IMAGE_IMAGE_H */