--- ray/src/rt/x11twind.h	2003/02/25 02:47:23	2.3
+++ ray/src/rt/x11twind.h	2003/06/07 00:54:58	2.5
@@ -1,4 +1,4 @@
-/* RCSid $Id: x11twind.h,v 2.3 2003/02/25 02:47:23 greg Exp $ */
+/* RCSid $Id: x11twind.h,v 2.5 2003/06/07 00:54:58 schorsch Exp $ */
 /*
  *  xtwind.h - header for X text window routines.
  *
@@ -8,7 +8,13 @@
  *  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 */
@@ -27,27 +33,12 @@ 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,
 			char *fontname);
 extern void	xt_puts(char *s, TEXTWIND *t);
-extern void	xt_putc(char c, TEXTWIND *t);
+extern void	xt_putc(int c, TEXTWIND *t);
 extern void	xt_delete(TEXTWIND *t, int r);
 extern void	xt_insert(TEXTWIND *t, int r);
 extern void	xt_redraw(TEXTWIND *t);
@@ -56,4 +47,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_ */
+