--- ray/src/rt/x11twind.h	2003/04/11 16:01:27	2.4
+++ ray/src/rt/x11twind.h	2003/06/27 06:53:23	2.6
@@ -1,4 +1,4 @@
-/* RCSid $Id: x11twind.h,v 2.4 2003/04/11 16:01:27 greg Exp $ */
+/* RCSid $Id: x11twind.h,v 2.6 2003/06/27 06:53:23 greg Exp $ */
 /*
  *  xtwind.h - header for X text window routines.
  *
@@ -8,9 +8,12 @@
  *  Modified for X11 B. V. Smith
  *	9/26/88
  */
+#ifndef _RAD_X11TWIND_H_
+#define _RAD_X11TWIND_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#include "copyright.h"
-
 #define LEFTMAR	2			/* left margin width */
 
 typedef struct {
@@ -27,21 +30,6 @@ typedef struct {
 #define TNOCURS		0
 #define TBLKCURS	1
 
-#ifdef NOPROTO
-
-extern TEXTWIND  *xt_open();
-extern void	xt_puts();
-extern void	xt_putc();
-extern void	xt_delete();
-extern void	xt_insert();
-extern void	xt_redraw();
-extern void	xt_clear();
-extern void	xt_move();
-extern int	xt_cursor();
-extern void	xt_close();
-
-#else
-
 extern TEXTWIND	*xt_open(Display *dpy, Window parent,
 			int x, int y, int width, int height,
 			int bw, unsigned long fore, unsigned long back,
@@ -56,4 +44,9 @@ extern void	xt_move(TEXTWIND *t, int r, int c);
 extern int	xt_cursor(TEXTWIND *t, int curs);
 extern void	xt_close(TEXTWIND *t);
 
+
+#ifdef __cplusplus
+}
 #endif
+#endif /* _RAD_X11TWIND_H_ */
+