diff -ru RHIDE_orig/gdb-5.3/gdb/remote.c RHIDE/gdb-5.3/gdb/remote.c
--- RHIDE_orig/gdb-5.3/gdb/remote.c	2002-08-18 18:17:57.000000000 -0500
+++ RHIDE/gdb-5.3/gdb/remote.c	2011-12-23 03:01:43.511924189 -0600
@@ -3607,7 +3607,8 @@
   {
     int i;
     regs = alloca (rs->sizeof_g_packet);
-    memset (regs, rs->sizeof_g_packet, 0);
+    /*memset (regs, rs->sizeof_g_packet, 0);*/
+    memset (regs, 0, rs->sizeof_g_packet);
     for (i = 0; i < NUM_REGS + NUM_PSEUDO_REGS; i++)
       {
 	struct packet_reg *r = &rs->regs[i];
diff -ru RHIDE_orig/gdb-5.3/gdb/ser-pipe.c RHIDE/gdb-5.3/gdb/ser-pipe.c
--- RHIDE_orig/gdb-5.3/gdb/ser-pipe.c	2001-07-11 12:52:32.000000000 -0500
+++ RHIDE/gdb-5.3/gdb/ser-pipe.c	2011-12-23 03:03:29.251921401 -0600
@@ -138,7 +138,8 @@
 _initialize_ser_pipe (void)
 {
   struct serial_ops *ops = XMALLOC (struct serial_ops);
-  memset (ops, sizeof (struct serial_ops), 0);
+  /*memset (ops, sizeof (struct serial_ops), 0);*/
+  memset (ops, 0, sizeof (struct serial_ops));
   ops->name = "pipe";
   ops->next = 0;
   ops->open = pipe_open;
diff -ru RHIDE_orig/gdb-5.3/gdb/ser-tcp.c RHIDE/gdb-5.3/gdb/ser-tcp.c
--- RHIDE_orig/gdb-5.3/gdb/ser-tcp.c	2002-05-16 14:51:08.000000000 -0500
+++ RHIDE/gdb-5.3/gdb/ser-tcp.c	2011-12-23 03:05:00.819918971 -0600
@@ -208,7 +208,8 @@
 _initialize_ser_tcp (void)
 {
   struct serial_ops *ops = XMALLOC (struct serial_ops);
-  memset (ops, sizeof (struct serial_ops), 0);
+  /*memset (ops, sizeof (struct serial_ops), 0);*/
+  memset (ops, 0, sizeof (struct serial_ops));
   ops->name = "tcp";
   ops->next = 0;
   ops->open = net_open;
diff -ru RHIDE_orig/gdb-5.3/gdb/ser-unix.c RHIDE/gdb-5.3/gdb/ser-unix.c
--- RHIDE_orig/gdb-5.3/gdb/ser-unix.c	2001-07-15 15:34:14.000000000 -0500
+++ RHIDE/gdb-5.3/gdb/ser-unix.c	2011-12-23 03:06:02.087917363 -0600
@@ -1337,7 +1337,8 @@
 _initialize_ser_hardwire (void)
 {
   struct serial_ops *ops = XMALLOC (struct serial_ops);
-  memset (ops, sizeof (struct serial_ops), 0);
+  /*memset (ops, sizeof (struct serial_ops), 0);*/
+  memset (ops, 0, sizeof (struct serial_ops));
   ops->name = "hardwire";
   ops->next = 0;
   ops->open = hardwire_open;
diff -ru RHIDE_orig/gdb-5.3/gdb/std-regs.c RHIDE/gdb-5.3/gdb/std-regs.c
--- RHIDE_orig/gdb-5.3/gdb/std-regs.c	2002-08-02 15:51:21.000000000 -0500
+++ RHIDE/gdb-5.3/gdb/std-regs.c	2011-12-23 03:06:58.167915882 -0600
@@ -61,7 +61,7 @@
   val = allocate_value (builtin_type_frame_reg);
   VALUE_LVAL (val) = not_lval;
   buf = VALUE_CONTENTS_RAW (val);
-  memset (buf, TYPE_LENGTH (VALUE_TYPE (val)), 0);
+  memset (buf, 0, TYPE_LENGTH (VALUE_TYPE (val)));
   /* frame.base.  */
   if (frame != NULL)
     ADDRESS_TO_POINTER (builtin_type_void_data_ptr, buf, frame->frame);
@@ -81,7 +81,7 @@
     struct value *val = allocate_value (builtin_type_void_data_ptr);
     char *buf = VALUE_CONTENTS_RAW (val);
     if (frame == NULL)
-      memset (buf, TYPE_LENGTH (VALUE_TYPE (val)), 0);
+      memset (buf, 0, TYPE_LENGTH (VALUE_TYPE (val)));
     else
       ADDRESS_TO_POINTER (builtin_type_void_data_ptr, buf, frame->frame);
     return val;
@@ -99,7 +99,7 @@
     struct value *val = allocate_value (builtin_type_void_data_ptr);
     char *buf = VALUE_CONTENTS_RAW (val);
     if (frame == NULL)
-      memset (buf, TYPE_LENGTH (VALUE_TYPE (val)), 0);
+      memset (buf, 0, TYPE_LENGTH (VALUE_TYPE (val)));
     else
       ADDRESS_TO_POINTER (builtin_type_void_data_ptr, buf, frame->pc);
     return val;
diff -ru RHIDE_orig/gdb-5.3/include/obstack.h RHIDE/gdb-5.3/include/obstack.h
--- RHIDE_orig/gdb-5.3/include/obstack.h	2001-03-13 20:27:43.000000000 -0600
+++ RHIDE/gdb-5.3/include/obstack.h	2011-12-22 23:13:55.880285098 -0600
@@ -423,7 +423,7 @@
 ({ struct obstack *__o = (OBSTACK);					\
    if (__o->next_free + sizeof (void *) > __o->chunk_limit)		\
      _obstack_newchunk (__o, sizeof (void *));				\
-   *((void **)__o->next_free)++ = ((void *)datum);			\
+   *((*(void ***)__o->next_free)++) = ((void *)datum);			\
    (void) 0; })
 
 # define obstack_int_grow(OBSTACK,datum)				\
@@ -431,7 +431,7 @@
 ({ struct obstack *__o = (OBSTACK);					\
    if (__o->next_free + sizeof (int) > __o->chunk_limit)		\
      _obstack_newchunk (__o, sizeof (int));				\
-   *((int *)__o->next_free)++ = ((int)datum);				\
+   *(((int *)__o->next_free)++) = ((int)datum);				\
    (void) 0; })
 
 # define obstack_ptr_grow_fast(h,aptr) (*((void **) (h)->next_free)++ = (void *)aptr)
diff -ru RHIDE_orig/rhide-1.5/commands.cc RHIDE/rhide-1.5/commands.cc
--- RHIDE_orig/rhide-1.5/commands.cc	2003-01-04 02:54:51.000000000 -0600
+++ RHIDE/rhide-1.5/commands.cc	2011-12-22 22:27:43.320358309 -0600
@@ -116,7 +116,6 @@
   __CM(StopMacro,90)\
   __CM(PlayMacro,91)\
   __CM(SetGlobalOptions,92)\
-  __CM(SaveAsUNIX,93)\
   __CM(CopyBlock,94)\
   __CM(SelRectStart,95)\
   __CM(SelRectEnd,96)\
@@ -147,11 +146,14 @@
   __CM(SaveSameTime,121)\
   __CM(WrapOn,122)\
   __CM(WrapOff,123)\
-  __CM(WrapToggle,124)\
-  __CM(UpdateCodePage,125)
+  __CM(WrapToggle,124)
 #undef __CM
 #define __CM(x,y) add_command_constant("cmc"#x,cmc##x);
 __RHIDE_EDITOR_COMMANDS__}
 
 
+/*
+  __CM(SaveAsUNIX,93)\
+  __CM(UpdateCodePage,125)
+*/
 
diff -ru RHIDE_orig/rhide-1.5/common.var RHIDE/rhide-1.5/common.var
--- RHIDE_orig/rhide-1.5/common.var	2002-01-13 08:46:48.000000000 -0600
+++ RHIDE/rhide-1.5/common.var	2011-12-23 19:55:24.306318156 -0600
@@ -17,5 +17,6 @@
 RHIDE_OS_CFLAGS_Linux=-pipe -D_GNU_SOURCE
 RHIDE_OS_CXXFLAGS_Linux=-pipe -D_GNU_SOURCE
 RHIDE_LIBDIRS=$(addprefix -L,$(dir $(LIBGDB_A)) $(LIB_DIRS))
-PCRE_OBJ=$(subst Linux,linux,$(SETOBJ)/$(RHIDE_OS))
+#PCRE_OBJ=$(subst Linux,linux,$(SETOBJ)/$(RHIDE_OS))
+PCRE_OBJ=$(subst Linux,linux,$(SETOBJ))
 
diff -ru RHIDE_orig/rhide-1.5/configure RHIDE/rhide-1.5/configure
--- RHIDE_orig/rhide-1.5/configure	2003-02-15 08:58:54.000000000 -0600
+++ RHIDE/rhide-1.5/configure	2011-12-22 22:18:41.072372629 -0600
@@ -1722,6 +1722,7 @@
 
 case "$host" in
   i?86-*-linux*) rhide_OS=Linux ;;
+  *64*linux*) rhide_OS=Linux ;;
   i?86-pc-msdosdjgpp) rhide_OS=DJGPP ;;
   *-pc-cygwin) rhide_OS=CYGWIN ;;
   *) { { echo "$as_me:1727: error: $host is not supported (yet). Sorry." >&5
diff -ru RHIDE_orig/rhide-1.5/gpr2mak.cc RHIDE/rhide-1.5/gpr2mak.cc
--- RHIDE_orig/rhide-1.5/gpr2mak.cc	2003-01-04 02:54:52.000000000 -0600
+++ RHIDE/rhide-1.5/gpr2mak.cc	2011-12-22 22:34:24.736347709 -0600
@@ -111,7 +111,7 @@
   {
     string_free(locale_dir);
     // get the system default localedir
-    char *_locale_dir = BINDTEXTDOMAIN("rhide", NULL);
+    const char *_locale_dir = BINDTEXTDOMAIN("rhide", NULL);
 
     if (_locale_dir)
       locale_dir = string_dup(_locale_dir);
diff -ru RHIDE_orig/rhide-1.5/gpr2mak.mak RHIDE/rhide-1.5/gpr2mak.mak
--- RHIDE_orig/rhide-1.5/gpr2mak.mak	2003-02-16 16:52:40.000000000 -0600
+++ RHIDE/rhide-1.5/gpr2mak.mak	2011-12-22 22:37:18.268343126 -0600
@@ -237,7 +237,7 @@
 RHIDE_GPC_FLAGS=$(RHIDE_INCLUDES) $(C_DEBUG_FLAGS) $(C_OPT_FLAGS)\
 	$(C_WARN_FLAGS)  $(C_P_LANG_FLAGS) $(C_EXTRA_FLAGS)
 RHIDE_GPROF=gprof $(OUTFILE)
-RHIDE_GREP=grep -n $(prompt arguments for GREP,$(WUC) $(DEFAULT_GREP_MASK))
+RHIDE_GREP=grep -n $(prompt ,$(WUC) $(DEFAULT_GREP_MASK))
 RHIDE_GXX=$(RHIDE_GCC)
 RHIDE_INCLUDES=$(SPECIAL_CFLAGS) $(addprefix -I,$(INCLUDE_DIRS))
 RHIDE_LD=$(RHIDE_GCC)
diff -ru RHIDE_orig/rhide-1.5/gprexp.cc RHIDE/rhide-1.5/gprexp.cc
--- RHIDE_orig/rhide-1.5/gprexp.cc	2003-02-08 16:51:10.000000000 -0600
+++ RHIDE/rhide-1.5/gprexp.cc	2011-12-23 19:59:38.766311439 -0600
@@ -161,7 +161,7 @@
   {
     string_free(locale_dir);
     // get the system default localedir
-    char *_locale_dir = BINDTEXTDOMAIN("rhide", NULL);
+    const char *_locale_dir = BINDTEXTDOMAIN("rhide", NULL);
 
     if (_locale_dir)
       locale_dir = string_dup(_locale_dir);
diff -ru RHIDE_orig/rhide-1.5/gprexp.mak RHIDE/rhide-1.5/gprexp.mak
--- RHIDE_orig/rhide-1.5/gprexp.mak	2003-02-16 16:52:40.000000000 -0600
+++ RHIDE/rhide-1.5/gprexp.mak	2011-12-23 19:59:19.806311939 -0600
diff -ru RHIDE_orig/rhide-1.5/ideapp.cc RHIDE/rhide-1.5/ideapp.cc
--- RHIDE_orig/rhide-1.5/ideapp.cc	2003-01-04 02:54:52.000000000 -0600
+++ RHIDE/rhide-1.5/ideapp.cc	2011-12-23 20:54:34.598224406 -0600
@@ -149,9 +149,12 @@
   char *sh = expand_spec("$(SHELL)", NULL);
 
   if (!*sh)
-    sh = string_dup("/bin/sh");
+    sh = string_dup("/bin/sh -i");
   // I hope any usual shell accepts the -i switch
+  /* Bad assumption; this has to be something like xterm in a X11 environment.
+   * Moved into the sh defaulting line where you can be sure it will work.
   string_cat(sh, " -i");
+  */
   if (debug_commands)
   {
     fprintf(stderr, "%s: %s\n", _("executing: "), sh);
diff -ru RHIDE_orig/rhide-1.5/idecomp.cc RHIDE/rhide-1.5/idecomp.cc
--- RHIDE_orig/rhide-1.5/idecomp.cc	2003-01-04 02:54:53.000000000 -0600
+++ RHIDE/rhide-1.5/idecomp.cc	2011-12-22 22:28:44.604356690 -0600
@@ -940,7 +940,7 @@
 
     if (!*dir)
       continue;
-    char *tok, *res = NULL;
+    const char *tok, *res = NULL;
 
     /*
        dir may be more than one directory 
diff -ru RHIDE_orig/rhide-1.5/idedebug.cc RHIDE/rhide-1.5/idedebug.cc
--- RHIDE_orig/rhide-1.5/idedebug.cc	2002-04-10 14:33:37.000000000 -0500
+++ RHIDE/rhide-1.5/idedebug.cc	2011-12-23 17:24:07.470557840 -0600
@@ -28,6 +28,7 @@
 
 #include <rhutils.h>
 
+#define INCLUDE_SYSTEM_H
 #define Uses_IDEConst
 #include "rhide.h"
 #include "rhidehis.h"
@@ -49,6 +50,10 @@
 #define Uses_TDataWindow
 #include <libtvgdb.h>
 
+// This is extern in several places, but never defined for real. Replace with reference to static.
+int &dual_display = TDisplay::dual_display;
+//
+
 static void RemoveSessionTempFiles(void);
 
 TDisassemblerWindow *dis_win;
diff -ru RHIDE_orig/rhide-1.5/idemain.cc RHIDE/rhide-1.5/idemain.cc
--- RHIDE_orig/rhide-1.5/idemain.cc	2002-02-14 12:33:51.000000000 -0600
+++ RHIDE/rhide-1.5/idemain.cc	2011-12-23 20:46:07.222237806 -0600
@@ -115,7 +115,9 @@
 #include <edhists.h>
 
 void SaveScreen();
+/* This isn't defined (?).
 void RestoreScreen();
+*/
 static int keep_temp_dir = 0;
 
 #define DELTA(x) (*((long *)(x)))
@@ -739,7 +741,7 @@
     D(cmCompile);
   }
 
-  if (dual_display)
+  if (TDisplay::dual_display)
   {
     D(cmUserScreen);
   }
@@ -1726,7 +1728,7 @@
 
           TMouse::suspend();
           update_flag = 0;
-#ifdef __linux__
+#if defined(__linux__) && 0
           RestoreScreen();
 #else
           TScreen::suspend();
@@ -1932,7 +1934,9 @@
   char *_rhide_opt = expand_rhide_spec("$(RHIDEOPT)");
   char *rhide_opt = NULL;
 
+  /* Not defined
   TGKey::useBIOS = 0;
+  */
 
   if (*_rhide_opt)
   {
@@ -1976,11 +1980,13 @@
           no_sigint = 1;
           break;
         case 'H':
+#if 0
 #ifdef __linux__
           extern int install_console_sigs;
 
           install_console_sigs = 0;
 #endif
+#endif
           break;
         case 'S':
 #ifdef __DJGPP__
@@ -2001,7 +2007,9 @@
 #endif
           break;
         case 'K':
+          /* Not defined.
           TGKey::useBIOS = 1;
+          */
           break;
         case 'G':
           arg = next_option(rhide_opt, rhide_opt_end, i, argc, argv);
@@ -2014,7 +2022,9 @@
 #endif
           break;
         case 'p':
+          /* Not defined.
           TGKey::translateKeyPad = 0;
+          */
           break;
         case 'k':
           arg = next_option(rhide_opt, rhide_opt_end, i, argc, argv);
@@ -2445,7 +2455,7 @@
   {
     string_free(locale_dir);
     // get the system default localedir
-    char *_locale_dir = BINDTEXTDOMAIN("rhide", NULL);
+    const char *_locale_dir = BINDTEXTDOMAIN("rhide", NULL);
     if (_locale_dir)
       locale_dir = string_dup(_locale_dir);
     else
@@ -2557,7 +2567,7 @@
   SLPInterfaceInit(ExpandFileNameToThePointWhereTheProgramWasLoaded
                    ("macros.slp"));
 
-  char *syntax_file;
+  const char *syntax_file;
 
   TCEditor::SHLGenList = new TNoCaseStringCollection(5, 5);
   syntax_file = ExpandFileNameToThePointWhereTheProgramWasLoaded(SHLFile);
diff -ru RHIDE_orig/rhide-1.5/idemak.cc RHIDE/rhide-1.5/idemak.cc
--- RHIDE_orig/rhide-1.5/idemak.cc	2003-02-08 16:49:36.000000000 -0600
+++ RHIDE/rhide-1.5/idemak.cc	2011-12-22 22:32:45.404350333 -0600
@@ -137,41 +137,45 @@
 {
   int len;
   char *lf = NULL;
+  char *s0 = strdup(s); /* s can't be const (free) AND must be const; need new vars */
+  char *s1 = s0;
 
   while (1)
   {
-    lf = strchr(s, '\n');
+    lf = strchr(s1, '\n');
     if (lf)
       *lf = 0;
-    len = strlen(s);
+    len = strlen(s1);
     if (len + start_len <= max_len)
     {
-      fprintf(f, "%s\n", s);
+      fprintf(f, "%s\n", s1);
       if (lf)
       {
         *lf = '\n';
-        s = lf + 1;
+        s1 = lf + 1;
         continue;
       }
+      free(s0);
       return;
     }
-    const char *tmp;
+    char *tmp;
 
-    tmp = s + max_len - start_len;
-    while (tmp > s && *tmp != ' ')
+    tmp = s1 + max_len - start_len;
+    while (tmp > s1 && *tmp != ' ')
       tmp--;
-    if (tmp == s)
+    if (tmp == s1)
     {
-      fprintf(f, "%s\n", s);
+      fprintf(f, "%s\n", s1);
       if (lf)
       {
         *lf = '\n';
-        s = lf + 1;
+        s1 = lf + 1;
         continue;
       }
+      free(s0);
       return;
     }
-    const char *_tmp = s;
+    const char *_tmp = s1;
 
     do
     {
@@ -181,12 +185,13 @@
     while (_tmp < tmp);
     fprintf(f, "\\\n\t");
     start_len = 8;              // tabsize
-    s = tmp + 1;
+    s1 = tmp + 1;
     if (lf)
     {
       *lf = '\n';
     }
   }
+  free(s0);
 }
 
 void
diff -ru RHIDE_orig/rhide-1.5/ideopt.cc RHIDE/rhide-1.5/ideopt.cc
--- RHIDE_orig/rhide-1.5/ideopt.cc	2003-01-04 02:54:54.000000000 -0600
+++ RHIDE/rhide-1.5/ideopt.cc	2011-12-23 01:56:48.976027030 -0600
@@ -439,7 +439,7 @@
 TWindowInit(TEnvironmentDialog::initFrame)
 {
   TRect r, r1, r2;
-  char *tmp;
+  const char *tmp;
 
 #ifdef __DJGPP__
   char tabstring[10];
@@ -1158,7 +1158,7 @@
 TWindowInit(&TLocalDialog::initFrame)
 {
   TRect r, rr, rrr;
-  char *tmp;
+  const char *tmp;
 
   r = TRect(2, 2, 32, 3);
   cmdline = new TEnterInputLine(r, 255);
@@ -1363,18 +1363,18 @@
   Boolean retval;
   TParamList *pl = new TParamList();
 
-  retval = pl->FromString(dialog->cmdline->data);
+  retval = pl->FromString((const char *)dialog->cmdline->getData());
   destroy(pl);
   if (retval == False)
     return False;
-  dep->local_options->FromString(dialog->cmdline->data);
+  dep->local_options->FromString((const char *)dialog->cmdline->getData());
   if (dep->compile_id != COMPILE_PROJECT)
   {
     if (dep->dest_name)
       delete dep->dest_name;
     char *tmp;
 
-    BaseName(dialog->output_name->data, tmp);
+    BaseName((const char *)dialog->output_name->getData(), tmp);
     InitFName(dep->dest_name, tmp);
     string_free(tmp);
     dep->dest_file_type = get_file_type(FName(dep->dest_name));
@@ -1414,9 +1414,9 @@
       dep->compile_id = COMPILE_UNKNOWN;
   }
   string_free(dep->compiler);
-  string_dup(dep->compiler, dialog->compiler->data);
+  string_dup(dep->compiler, (const char *)dialog->compiler->getData());
   string_free(dep->error_check);
-  string_dup(dep->error_check, dialog->error_prog->data);
+  string_dup(dep->error_check, (const char *)dialog->error_prog->getData());
   dialog->error_type->getData(&dep->error_type);
   dialog->others->getData(&dep->flags);
   return True;
diff -ru RHIDE_orig/rhide-1.5/ideprj.cc RHIDE/rhide-1.5/ideprj.cc
--- RHIDE_orig/rhide-1.5/ideprj.cc	2003-01-04 02:54:56.000000000 -0600
+++ RHIDE/rhide-1.5/ideprj.cc	2011-12-23 16:50:07.350611712 -0600
@@ -316,18 +316,22 @@
 }
 
 /* They are in tscreen.cc */
+/* No they're not
 void setBlinkState(void);
 void setIntenseState(void);
+*/
 
 void
 SetProjectScreenMode()
 {
   if (TScreen::screenMode != Project.screen_mode)
     TProgram::application->setScreenMode(Project.screen_mode);
+  /* see above -- these aren't available
   if (IntenseMode)
     setIntenseState();
   else
     setBlinkState();
+  */
 }
 
 static void
@@ -790,7 +794,7 @@
 }
 
 char *
-select_project(char *title)
+select_project(const char *title)
 {
   ushort result;
   TFileDialog *dialog;
@@ -1596,8 +1600,8 @@
 }
 
 TFileDialog *
-FileOpenDialog(char *init_val, char *title, char *input_label,
-               ushort aOptions, int hist, char *init_dir)
+FileOpenDialog(char *init_val, const char *title, const char *input_label,
+               ushort aOptions, int hist, const char *init_dir)
 {
   TFileDialog *dialog;
 
diff -ru RHIDE_orig/rhide-1.5/idespec.cc RHIDE/rhide-1.5/idespec.cc
--- RHIDE_orig/rhide-1.5/idespec.cc	2003-02-08 16:47:28.000000000 -0600
+++ RHIDE/rhide-1.5/idespec.cc	2011-12-22 22:33:20.828349396 -0600
@@ -402,7 +402,7 @@
  "*.[cfhmnps]*",
 
  "RHIDE_GREP",
- "grep -n $(prompt "__("arguments for GREP")",$(WUC) $(DEFAULT_GREP_MASK))",
+ "grep -n $(prompt ,$(WUC) $(DEFAULT_GREP_MASK))",
 
  "RHIDE_GPROF",
  "gprof $(OUTFILE)",
diff -ru RHIDE_orig/rhide-1.5/idesynta.cc RHIDE/rhide-1.5/idesynta.cc
--- RHIDE_orig/rhide-1.5/idesynta.cc	2002-04-10 14:33:53.000000000 -0500
+++ RHIDE/rhide-1.5/idesynta.cc	2011-12-23 01:58:12.328024829 -0600
@@ -637,7 +637,7 @@
   TRadioButtons *radio;
   TCheckBoxes *check;
   TIntInputLine *inp;
-  char *tmp;
+  const char *tmp;
 
   d = new TDialog(TRect(0, 0, 42, 15), _("Options for syntax help"));
   d->options |= ofCentered;
diff -ru RHIDE_orig/rhide-1.5/include/rhide.h RHIDE/rhide-1.5/include/rhide.h
--- RHIDE_orig/rhide-1.5/include/rhide.h	2002-01-16 15:15:46.000000000 -0600
+++ RHIDE/rhide-1.5/include/rhide.h	2011-12-23 01:52:00.340034652 -0600
@@ -178,9 +178,9 @@
 void EnableShadows();
 void DisableShadows();
 class TFileDialog;
-char *select_project(char *title);
-TFileDialog *FileOpenDialog(char *init_val, char *title, char *input_label,
-                            ushort aOptions, int hist, char *init_dir);
+char *select_project(const char *title);
+TFileDialog *FileOpenDialog(char *init_val, const char *title, const char *input_label,
+                            ushort aOptions, int hist, const char *init_dir);
 extern char *default_directory;
 
 /* module ideutil.cc */
diff -ru RHIDE_orig/rhide-1.5/libgdb/makefile.src RHIDE/rhide-1.5/libgdb/makefile.src
--- RHIDE_orig/rhide-1.5/libgdb/makefile.src	2003-02-16 06:19:57.000000000 -0600
+++ RHIDE/rhide-1.5/libgdb/makefile.src	2011-12-22 22:23:12.764365453 -0600
@@ -180,8 +180,8 @@
 	$(MAKE) -C $(dir $@) $(notdir $@)
 	
 echo_ver.exe: $(GDB_OBJ)/gdb/version.o
-	echo 'int main(int argc, char **argv)\
-	  {extern const char version[];printf("%s\n",version);return 0;}' | \
+	(echo '#include <stdio.h>'; echo 'int main(int argc, char **argv)\
+	  {extern const char version[];printf("%s\\n",version);return 0;}') | \
 	gcc -s -o $@ $< -x c -
 
 gdb_ver.txt: echo_ver.exe
diff -ru RHIDE_orig/rhide-1.5/libide/ideclass.cc RHIDE/rhide-1.5/libide/ideclass.cc
--- RHIDE_orig/rhide-1.5/libide/ideclass.cc	2002-04-10 14:34:17.000000000 -0500
+++ RHIDE/rhide-1.5/libide/ideclass.cc	2011-12-22 22:23:51.484364432 -0600
@@ -33,7 +33,7 @@
 {
   if (!_ext)
     return FILE_NOTHING;
-  char *ext = strrchr(_ext, '.');
+  const char *ext = strrchr(_ext, '.');
 
   if (!ext)
   {
diff -ru RHIDE_orig/rhide-1.5/libide/tdepende.cc RHIDE/rhide-1.5/libide/tdepende.cc
--- RHIDE_orig/rhide-1.5/libide/tdepende.cc	2003-01-04 02:54:58.000000000 -0600
+++ RHIDE/rhide-1.5/libide/tdepende.cc	2011-12-23 01:23:09.272080362 -0600
@@ -199,7 +199,7 @@
   os << dependencies;
   local_options->ToString(localoptions);
   if (strlen(localoptions) == 0)
-    os.writeString(NULL);
+    os.writeString((const char *)NULL);
   else
     os.writeString(localoptions);
   delete(localoptions);
diff -ru RHIDE_orig/rhide-1.5/libide/tfname.cc RHIDE/rhide-1.5/libide/tfname.cc
--- RHIDE_orig/rhide-1.5/libide/tfname.cc	2002-04-10 14:34:18.000000000 -0500
+++ RHIDE/rhide-1.5/libide/tfname.cc	2011-12-22 22:26:47.848359773 -0600
@@ -18,7 +18,7 @@
 {
   char *name;
 #ifdef USE_SLASH
-  char *slash;
+  const char *slash;
 #endif
 #ifdef REMOVE_FILENAMES
   int alloc_count;
diff -ru RHIDE_orig/rhide-1.5/libtvgdb/breakdia.cc RHIDE/rhide-1.5/libtvgdb/breakdia.cc
--- RHIDE_orig/rhide-1.5/libtvgdb/breakdia.cc	2002-04-10 14:34:22.000000000 -0500
+++ RHIDE/rhide-1.5/libtvgdb/breakdia.cc	2011-12-22 23:44:47.344236208 -0600
@@ -45,7 +45,8 @@
   TScrollBar *sb;
   TRect r, rr;
   int size;
-  char tmp[256], *temp, *_tmp;
+  char tmp[256], *temp;
+  const char *_tmp;
 
   helpCtx = hcBreakListDialog;
   r = getExtent();
@@ -232,8 +233,8 @@
 TBreakEditDialog::TBreakEditDialog(const char *Title):
 TDialog(TRect(0, 0, 51, 14), Title), TWindowInit(TBreakEditDialog::initFrame)
 {
-  char *i1 = _("File/L~i~ne");
-  char *i2 = _("Fu~n~ction");
+  const char *i1 = _("File/L~i~ne");
+  const char *i2 = _("Fu~n~ction");
   int l = max(cstrlen(i1), cstrlen(i2));
   TRect r(30, 2, 30 + l + 6, 4);
 
@@ -301,7 +302,7 @@
 EditBreak(int number)
 {
   ushort type, control;
-  char buffer[512], *_buffer, *tit;
+  char buffer[512], *_buffer; const char *tit;
   BreakPoint *bp;
   TBreakEditDialog *dialog;
 
diff -ru RHIDE_orig/rhide-1.5/libtvgdb/include/tvgdbfun.h RHIDE/rhide-1.5/libtvgdb/include/tvgdbfun.h
--- RHIDE_orig/rhide-1.5/libtvgdb/include/tvgdbfun.h	2002-04-10 14:34:25.000000000 -0500
+++ RHIDE/rhide-1.5/libtvgdb/include/tvgdbfun.h	2011-12-23 00:31:10.716162711 -0600
@@ -4,8 +4,8 @@
 #define tvgdbFunctions__
 
 void Evaluate(char *watch = NULL);
-void AddWatchEntry(char *var = NULL);
-void AddWatch(char *buffer, Boolean show_window = True);
+void AddWatchEntry(const char *var = NULL);
+void AddWatch(const char *buffer, Boolean show_window = True);
 void OpenWatchWindow();
 void DeleteAllWatches();
 void DeleteAllBreakPoints();
diff -ru RHIDE_orig/rhide-1.5/libtvgdb/include/twatchli.h RHIDE/rhide-1.5/libtvgdb/include/twatchli.h
--- RHIDE_orig/rhide-1.5/libtvgdb/include/twatchli.h	2002-04-10 14:34:25.000000000 -0500
+++ RHIDE/rhide-1.5/libtvgdb/include/twatchli.h	2011-12-23 00:25:35.936171551 -0600
@@ -18,7 +18,7 @@
   void update();
   void GetVariable(ccIndex item, char *buffer, int maxlen);
   void SetVariable(ccIndex item, char *buffer);
-  void AddVariable(char *var);
+  void AddVariable(const char *var);
   void RemoveVariable(ccIndex item);
   virtual void getText(char *dest, ccIndex index, short maxlen);
 };
diff -ru RHIDE_orig/rhide-1.5/libtvgdb/twatchdi.cc RHIDE/rhide-1.5/libtvgdb/twatchdi.cc
--- RHIDE_orig/rhide-1.5/libtvgdb/twatchdi.cc	2002-04-10 14:34:24.000000000 -0500
+++ RHIDE/rhide-1.5/libtvgdb/twatchdi.cc	2011-12-22 23:51:14.332225988 -0600
@@ -89,7 +89,7 @@
 void
 TWatchDialog::handleEvent(TEvent & event)
 {
-  char *ret;
+  const char *ret;
   static char *empty_string = "";
 
   TDialog::handleEvent(event);
@@ -114,7 +114,7 @@
         }
         case cmChange:
         {
-          char input_buffer[256], new_buffer[256], *ret;
+          char input_buffer[256], new_buffer[256];
 
           newval->getData(new_buffer);
           input->getData(input_buffer);
diff -ru RHIDE_orig/rhide-1.5/libtvgdb/twatchli.cc RHIDE/rhide-1.5/libtvgdb/twatchli.cc
--- RHIDE_orig/rhide-1.5/libtvgdb/twatchli.cc	2002-04-10 14:34:24.000000000 -0500
+++ RHIDE/rhide-1.5/libtvgdb/twatchli.cc	2011-12-23 00:25:35.936171551 -0600
@@ -51,8 +51,8 @@
   int i, count = list()->getCount();
   TWatchEntry *e;
   int len = 0, maxlen = 0;
-  char *invalid = _("not available");
-  char *expr;
+  const char *invalid = _("not available");
+  const char *expr;
 
   for (i = 0; i < count; i++)
   {
@@ -81,7 +81,7 @@
 }
 
 void
-TWatchListBox::AddVariable(char *var)
+TWatchListBox::AddVariable(const char *var)
 {
   TWatchEntry *e;
 
diff -ru RHIDE_orig/rhide-1.5/libtvgdb/userwarn.cc RHIDE/rhide-1.5/libtvgdb/userwarn.cc
--- RHIDE_orig/rhide-1.5/libtvgdb/userwarn.cc	2002-04-10 14:34:24.000000000 -0500
+++ RHIDE/rhide-1.5/libtvgdb/userwarn.cc	2011-12-23 00:13:09.252191268 -0600
@@ -15,7 +15,7 @@
 static char buffer[1000];
 
 static char *
-IdentifyBreakPoint(struct BreakPoint *bp, char *msg)
+IdentifyBreakPoint(struct BreakPoint *bp, const char *msg)
 {
   if (BREAK_FUNCTION(bp))
   {
@@ -31,7 +31,7 @@
 }
 
 static char *
-merge_message(char *msg1, char *msg2)
+merge_message(const char *msg1, const char *msg2)
 {
   strcpy(buffer, msg1);
   strcat(buffer, msg2);
@@ -41,7 +41,7 @@
 void
 UserWarning(int number, ...)
 {
-  char *msg = NULL;
+  const char *msg = NULL;
   va_list arg;
   struct BreakPoint *bp;
 
diff -ru RHIDE_orig/rhide-1.5/libtvgdb/watches.cc RHIDE/rhide-1.5/libtvgdb/watches.cc
--- RHIDE_orig/rhide-1.5/libtvgdb/watches.cc	2002-04-10 14:34:24.000000000 -0500
+++ RHIDE/rhide-1.5/libtvgdb/watches.cc	2011-12-23 00:31:49.924161673 -0600
@@ -96,7 +96,7 @@
 }
 
 void
-AddWatch(char *buffer, Boolean show_window)
+AddWatch(const char *buffer, Boolean show_window)
 {
   if ((show_window == True) && !watchwindow)
     OpenWatchWindow();
@@ -106,14 +106,15 @@
 }
 
 void
-AddWatchEntry(char *_buffer)
+AddWatchEntry(const char *_buffer)
 {
   TWatchDialog *d;
 
   d = new TWatchDialog(TRect(10, 2, 70, 10), _("Add to watch list"),
                        _buffer ? _buffer : "", 0);
   if (TProgram::deskTop->execView(d) == cmOK)
-    AddWatch(d->input->data);
+    //AddWatch(d->input->data);
+    AddWatch((const char *)d->input->getData());
   destroy(d);
 }
 
diff -ru RHIDE_orig/rhide-1.5/libtvuti/configure RHIDE/rhide-1.5/libtvuti/configure
--- RHIDE_orig/rhide-1.5/libtvuti/configure	2003-02-15 06:13:24.000000000 -0600
+++ RHIDE/rhide-1.5/libtvuti/configure	2011-12-22 22:19:19.096371623 -0600
@@ -1726,6 +1726,7 @@
 
 case "$host" in
   i?86-*-linux*) rhide_OS=Linux ;;
+  *64*linux*) rhide_OS=Linux ;;
   i?86-pc-msdosdjgpp) rhide_OS=DJGPP ;;
   *-pc-cygwin) rhide_OS=CYGWIN ;;
   *) { { echo "$as_me:1731: error: $host is not supported (yet). Sorry." >&5
diff -ru RHIDE_orig/rhide-1.5/libtvuti/include/tintinpu.h RHIDE/rhide-1.5/libtvuti/include/tintinpu.h
--- RHIDE_orig/rhide-1.5/libtvuti/include/tintinpu.h	2002-04-10 14:34:58.000000000 -0500
+++ RHIDE/rhide-1.5/libtvuti/include/tintinpu.h	2011-12-22 23:54:09.080221373 -0600
@@ -7,7 +7,7 @@
 {
 public:
   TIntInputLine(const TRect &, int, int _unsigned = 0);
-  virtual void setData(void *);
+  virtual void setData(const void *);
   virtual void getData(void *);
   virtual uint32 dataSize();
 };
diff -ru RHIDE_orig/rhide-1.5/libtvuti/tintinpu.cc RHIDE/rhide-1.5/libtvuti/tintinpu.cc
--- RHIDE_orig/rhide-1.5/libtvuti/tintinpu.cc	2002-04-10 14:34:57.000000000 -0500
+++ RHIDE/rhide-1.5/libtvuti/tintinpu.cc	2011-12-22 23:53:46.908221961 -0600
@@ -20,9 +20,9 @@
 }
 
 void
-TIntInputLine::setData(void *rec)
+TIntInputLine::setData(const void *rec)
 {
-  int i = *((int *) rec);
+  int i = *((const int *) rec);
   char tmp[256];
 
   sprintf(tmp, "%d", i);
diff -ru RHIDE_orig/rhide-1.5/rhgdb/gdbedit.cc RHIDE/rhide-1.5/rhgdb/gdbedit.cc
--- RHIDE_orig/rhide-1.5/rhgdb/gdbedit.cc	2003-01-04 02:55:01.000000000 -0600
+++ RHIDE/rhide-1.5/rhgdb/gdbedit.cc	2011-12-23 18:49:13.322423015 -0600
@@ -122,10 +122,9 @@
   return *(palettes[palette]);
 }
 
-TGDBEditWindow::TGDBEditWindow(const TRect & bounds,
-const char *fileName, int aNumber):
-TCEditWindow(bounds, (const char *) NULL, aNumber),
-TWindowInit(&TGDBEditWindow::initFrame)
+TGDBEditWindow::TGDBEditWindow(const TRect & bounds, const char *fileName, int aNumber)
+  : TWindowInit(&TGDBEditWindow::initFrame),
+    TCEditWindow(bounds, (const char *) NULL, aNumber)
 {
   TRect r(editor->origin.x, editor->origin.y,
           editor->origin.x + editor->size.x,
diff -ru RHIDE_orig/rhide-1.5/rhgdb/gdbsynt.cc RHIDE/rhide-1.5/rhgdb/gdbsynt.cc
--- RHIDE_orig/rhide-1.5/rhgdb/gdbsynt.cc	2003-01-04 02:55:01.000000000 -0600
+++ RHIDE/rhide-1.5/rhgdb/gdbsynt.cc	2011-12-23 18:51:10.034419933 -0600
@@ -41,7 +41,7 @@
 void
 init_syntax()
 {
-  char *syntax_file;
+  const char *syntax_file;
 
 //  TCEditor::SHLSOStack=new SOStack;
 //  TCEditor::SHLGenList=new TNoCaseSOSStringCollection(5,5,TCEditor::SHLSOStack);
diff -ru RHIDE_orig/rhide-1.5/rhgdb/main.cc RHIDE/rhide-1.5/rhgdb/main.cc
--- RHIDE_orig/rhide-1.5/rhgdb/main.cc	2002-02-08 16:32:31.000000000 -0600
+++ RHIDE/rhide-1.5/rhgdb/main.cc	2011-12-23 19:19:59.810374255 -0600
@@ -61,6 +61,9 @@
 #include <librhgdb.h>
 #include "rhgdb.h"
 
+// This is extern in several places, but never defined for real. Replace with reference to static.
+int &dual_display = TDisplay::dual_display;
+//
 
 extern int RunProgram(const char *cmd,
                       Boolean redir_stderr, Boolean redir_stdout,
@@ -168,9 +171,9 @@
 }
 
 RHGDBApp::RHGDBApp():
-TApplication(),
-TProgInit(RHGDBApp::initStatusLine,
-          RHGDBApp::initMenuBar, RHGDBApp::initDeskTop)
+          TProgInit(RHGDBApp::initStatusLine,
+            RHGDBApp::initMenuBar, RHGDBApp::initDeskTop),
+          TApplication()
 {
 }
 
@@ -589,7 +592,7 @@
         case cmUserScreen:
         {
           TMouse::suspend();
-#if 0
+#if 1
           TScreen::suspend();
 #else
           RestoreScreen();
@@ -790,12 +793,16 @@
           use_dual_display = 1;
           break;
         case 'M':
+          /* Not defined anywhere...
           extern int use_mouse_handler;
 
           use_mouse_handler = 0;
+          */
           break;
         case 'K':
+          /* Not defined
           TGKey::useBIOS = 1;
+          */
           break;
         case 'G':
 //          extern int screen_saving;
@@ -892,7 +899,7 @@
   if (!locale_dir)
   {
     // get the system default localedir
-    char *_locale_dir = BINDTEXTDOMAIN("rhide", NULL);
+    const char *_locale_dir = BINDTEXTDOMAIN("rhide", NULL);
     if (_locale_dir)
       locale_dir = string_dup(_locale_dir);
     else
@@ -1579,7 +1586,7 @@
   if (TProgram::deskTop->execView(dialog) != cmCancel)
   {
     strcpy(fname, dialog->directory);
-    strcat(fname, dialog->fileName->data);
+    strcat(fname, (const char*)dialog->fileName->getData());
     SaveOptions(fname);
   }
   destroy(dialog);
@@ -1597,7 +1604,7 @@
   if (TProgram::deskTop->execView(dialog) != cmCancel)
   {
     strcpy(fname, dialog->directory);
-    strcat(fname, dialog->fileName->data);
+    strcat(fname, (const char*)dialog->fileName->getData());
     ReadOptions(fname);
   }
   destroy(dialog);
@@ -1614,7 +1621,7 @@
   if (TProgram::deskTop->execView(dialog) != cmCancel)
   {
     strcpy(fname, dialog->directory);
-    strcat(fname, dialog->fileName->data);
+    strcat(fname, (const char *)dialog->fileName->getData());
     OpenViewer(fname, 1, False);
   }
   destroy(dialog);
diff -ru RHIDE_orig/rhide-1.5/rhgdb/options.cc RHIDE/rhide-1.5/rhgdb/options.cc
--- RHIDE_orig/rhide-1.5/rhgdb/options.cc	2002-04-10 14:35:16.000000000 -0500
+++ RHIDE/rhide-1.5/rhgdb/options.cc	2011-12-23 19:18:21.842376844 -0600
@@ -37,13 +37,13 @@
   TCheckBoxes *check;
 };
 
-TEnvironmentDialog::TEnvironmentDialog():
-TDialog(TRect(0, 0, 65, 17), _("Environment options")),
-TWindowInit(TEnvironmentDialog::initFrame)
+TEnvironmentDialog::TEnvironmentDialog()
+  : TWindowInit(TEnvironmentDialog::initFrame),
+    TDialog(TRect(0, 0, 65, 17), _("Environment options"))
 {
   TRect
     r;
-  char *
+  const char *
     tmp;
   char
     tabstring[10];
diff -ru RHIDE_orig/rhide-1.5/rhgdb/rhgdb.mak RHIDE/rhide-1.5/rhgdb/rhgdb.mak
--- RHIDE_orig/rhide-1.5/rhgdb/rhgdb.mak	2003-02-16 16:52:48.000000000 -0600
+++ RHIDE/rhide-1.5/rhgdb/rhgdb.mak	2011-12-23 19:35:55.074349032 -0600
@@ -47,7 +47,8 @@
 	$(SETOBJ) $(PCRE_OBJ)
 C_DEBUG_FLAGS=-g
 C_OPT_FLAGS=-O2
-C_WARN_FLAGS=-Wall -Werror
+#C_WARN_FLAGS=-Wall -Werror
+C_WARN_FLAGS=-Wall
 C_C_LANG_FLAGS=
 C_CXX_LANG_FLAGS=
 C_P_LANG_FLAGS=
diff -ru RHIDE_orig/rhide-1.5/rhide.mak RHIDE/rhide-1.5/rhide.mak
--- RHIDE_orig/rhide-1.5/rhide.mak	2003-02-16 16:52:41.000000000 -0600
+++ RHIDE/rhide-1.5/rhide.mak	2011-12-22 23:14:26.124284298 -0600
@@ -248,7 +248,7 @@
 RHIDE_GPC_FLAGS=$(RHIDE_INCLUDES) $(C_DEBUG_FLAGS) $(C_OPT_FLAGS)\
 	$(C_WARN_FLAGS)  $(C_P_LANG_FLAGS) $(C_EXTRA_FLAGS)
 RHIDE_GPROF=gprof $(OUTFILE)
-RHIDE_GREP=grep -n $(prompt arguments for GREP,$(WUC) $(DEFAULT_GREP_MASK))
+RHIDE_GREP=grep -n $(prompt ,$(WUC) $(DEFAULT_GREP_MASK))
 RHIDE_GXX=$(RHIDE_GCC)
 RHIDE_INCLUDES=$(SPECIAL_CFLAGS) $(addprefix -I,$(INCLUDE_DIRS))
 RHIDE_LD=$(RHIDE_GCC)
diff -ru RHIDE_orig/rhide-1.5/rhide.var RHIDE/rhide-1.5/rhide.var
--- RHIDE_orig/rhide-1.5/rhide.var	2003-02-16 13:39:32.000000000 -0600
+++ RHIDE/rhide-1.5/rhide.var	2011-12-22 22:35:48.336345501 -0600
@@ -9,7 +9,7 @@
 RHIDE_LIBS_gpr2mak.exe=$(SET_LIBS) $(LIB_INTL)
 RHIDE_LIBS_gprexp.exe=$(SET_LIBS) $(LIB_INTL)
 RHIDE_OS_LIBS_$(RHIDE_OS)=$(RHIDE_OS_LIBS_$(RHIDE_OS)_$(MAIN_TARGET))
-RHIDE_OS_LIBS_Linux=ncurses gpm m dl
+RHIDE_OS_LIBS_Linux=ncurses gpm m dl Xmu
 RHIDE_OS_LIBS_CYGWIN=termcap
 RHIDE_OS_LIBS_DJGPP_idegc.exe=dbg
 RHIDE_OS_LIBS_DJGPP_rhgdb.exe=dbg
diff -ru RHIDE_orig/rhide-1.5/tvdemo/include/mousedlg.h RHIDE/rhide-1.5/tvdemo/include/mousedlg.h
--- RHIDE_orig/rhide-1.5/tvdemo/include/mousedlg.h	2002-04-10 14:35:17.000000000 -0500
+++ RHIDE/rhide-1.5/tvdemo/include/mousedlg.h	2011-12-23 00:38:16.576151464 -0600
@@ -11,7 +11,7 @@
 
 public:
 
-  TClickTester(TRect & r, char *aText);
+  TClickTester(TRect & r, const char *aText);
   virtual TPalette & getPalette() const;
   virtual void handleEvent(TEvent & event);
   virtual void draw();
diff -ru RHIDE_orig/rhide-1.5/tvdemo/mousedlg.cc RHIDE/rhide-1.5/tvdemo/mousedlg.cc
--- RHIDE_orig/rhide-1.5/tvdemo/mousedlg.cc	2002-04-10 14:35:17.000000000 -0500
+++ RHIDE/rhide-1.5/tvdemo/mousedlg.cc	2011-12-23 00:36:43.664153919 -0600
@@ -38,7 +38,7 @@
 // TClickTester functions
 //
 
-TClickTester::TClickTester(TRect & r, char *aText):
+TClickTester::TClickTester(TRect & r, const char *aText):
 TStaticText(r, aText)
 {
   clicked = 0;
diff -ru RHIDE_orig/setedit/include/loadshl.h RHIDE/setedit/include/loadshl.h
--- RHIDE_orig/setedit/include/loadshl.h	2004-06-25 11:24:59.000000000 -0500
+++ RHIDE/setedit/include/loadshl.h	2011-12-23 18:54:23.682414820 -0600
@@ -23,7 +23,7 @@
 
 struct strSHL;
 class  TStringCollection;
-extern int   LoadSyntaxHighLightFile(char *name, strSHL *&hl, TStringCollection *list,
+extern int   LoadSyntaxHighLightFile(const char *name, strSHL *&hl, TStringCollection *list,
                                      int &cant);
 extern int   LoadSyntaxHighLightKeywords(strSHL &hl);
 extern void  UnLoadSyntaxHighLightFile(strSHL *&hl, TStringCollection *list,int &Cant);
diff -ru RHIDE_orig/setedit/infview/include/inf.h RHIDE/setedit/infview/include/inf.h
--- RHIDE_orig/setedit/infview/include/inf.h	2004-08-19 13:06:21.000000000 -0500
+++ RHIDE/setedit/infview/include/inf.h	2011-12-20 23:18:11.581511134 -0600
@@ -20,6 +20,8 @@
 
 #include <infbase.h>
 
+#include <cstdio>
+
 #define MAX_HIST_DEEP 40
 #define MAX_NODE_NAME 90
 
@@ -310,7 +312,7 @@
 
  virtual TPalette& getPalette() const;
  virtual void close();
- virtual TInfWindow::~TInfWindow();
+ virtual ~TInfWindow();
  TInfViewer *viewer;
  Boolean isTheOne;
  static void SetMagicEditorInfoTranslation() { TInfViewer::TranslateName=1; };
diff -ru RHIDE_orig/setedit/infview/infmenu.cc RHIDE/setedit/infview/infmenu.cc
--- RHIDE_orig/setedit/infview/infmenu.cc	2003-04-16 15:24:13.000000000 -0500
+++ RHIDE/setedit/infview/infmenu.cc	2011-12-20 23:48:40.629462837 -0600
@@ -26,6 +26,8 @@
 #include "infalone.h"
 #include "inf.h"
 
+#include <cstdio>
+
 TMenuBar *TEditorMiApp::initMenuBar( TRect r )
 {
  TSubMenu& sub1 = *new TSubMenu( __("~F~ile"), kbAltF ) +
diff -ru RHIDE_orig/setedit/mainsrc/loadshl.cc RHIDE/setedit/mainsrc/loadshl.cc
--- RHIDE_orig/setedit/mainsrc/loadshl.cc	2004-08-13 10:36:01.000000000 -0500
+++ RHIDE/setedit/mainsrc/loadshl.cc	2011-12-23 18:54:47.606414188 -0600
@@ -182,7 +182,7 @@
  return 0;
 }
 
-int LoadSyntaxHighLightFile(char *name, strSHL *&hl, TStringCollection *list,int &Cant)
+int LoadSyntaxHighLightFile(const char *name, strSHL *&hl, TStringCollection *list,int &Cant)
 {
  FILE *f;
  ssize_t len;
diff -ru RHIDE_orig/setedit/setedit/runprog.cc RHIDE/setedit/setedit/runprog.cc
--- RHIDE_orig/setedit/setedit/runprog.cc	2004-08-06 14:14:05.000000000 -0500
+++ RHIDE/setedit/setedit/runprog.cc	2011-12-20 23:25:44.049499185 -0600
@@ -113,7 +113,7 @@
    {
     if (!CurrentParser)
        CurrentParser=newStr("GNU");
-    if (!list->search((void *)CurrentParser,box.tl.selection))
+    if (!list->search((void *)CurrentParser,(int&)box.tl.selection))
        box.tl.selection=0;
    }
 
@@ -131,7 +131,7 @@
          __("Don't make a beep when f~i~nished"),
          __("Don't finish debu~g~ session"),
          __("Don't move breakp~o~ints"),
-         __("~C~onfirm if stopping debug session"),0);
+         __("~C~onfirm if stopping debug session"),(char*)0);
  TSLabel *opsscroll=TSLabelRadio(__("Message window ~s~croll"),
          __("Al~w~ays"),__("~N~ever"),__("Only if not ~f~ocused"),0);
  TSVeGroup *grp=MakeVeGroup(0,progInput,options,opsscroll,0);
@@ -141,7 +141,7 @@
  TSLabel *optscrh=TSLabelCheck(__("~H~orizontal reset"),
          __("At ~b~eggining"),
          __("For each ~m~essage"),
-         __("At ~t~he end"),0);
+         __("At ~t~he end"),(char*)0);
  TSHzLabel *linesInput=new TSHzLabel(__("~L~ines per pass"),new TSInputLine(4));
  TSVeGroup *grp2=MakeVeGroup(0,optscrh,linesInput,0);
 
diff -ru RHIDE_orig/tvision/classes/ipstream.cc RHIDE/tvision/classes/ipstream.cc
--- RHIDE_orig/tvision/classes/ipstream.cc	2003-05-29 13:25:25.000000000 -0500
+++ RHIDE/tvision/classes/ipstream.cc	2011-12-20 23:09:54.289524267 -0600
@@ -28,6 +28,7 @@
 #define Uses_TPReadObjects
 #define Uses_PubStreamBuf
 #include <tv.h>
+#include <cstdio>
 
 ipstream::ipstream( CLY_streambuf *sb )
 {
diff -ru RHIDE_orig/tvision/classes/tinputli.cc RHIDE/tvision/classes/tinputli.cc
--- RHIDE_orig/tvision/classes/tinputli.cc	2004-08-17 08:18:43.000000000 -0500
+++ RHIDE/tvision/classes/tinputli.cc	2011-12-23 00:09:54.600196408 -0600
@@ -88,6 +88,7 @@
 template class TInputLineBaseT<char,TDrawBuffer>;
 template class TInputLineBaseT<uint16,TDrawBufferU16>;
 
+/* Need to move this to the header
 template <typename T, typename D>
 TInputLineBaseT<T,D>::TInputLineBaseT(const TRect& bounds, int aMaxLen) :
   TInputLineBase(bounds,aMaxLen)
@@ -96,6 +97,18 @@
  *((T *)data)=EOS;
  cellSize=sizeof(T);
 }
+*/
+
+/*
+template <>
+TInputLineBaseT<char,TDrawBuffer>::TInputLineBaseT(const TRect& bounds, int aMaxLen) :
+  TInputLineBase(bounds,aMaxLen)
+{
+ data=(char *)new char[aMaxLen];
+ *((char *)data)=EOS;
+ cellSize=sizeof(char);
+}
+*/
 
 void TInputLineBase::SetValidator(TValidator * aValidator)
 {
@@ -471,7 +484,7 @@
 }
 
 template <typename T, typename D>
-void TInputLineBaseT<T,D>::setData(void *rec)
+void TInputLineBaseT<T,D>::setData(const void *rec)
 {
  uint32 ds=dataSize()-sizeof(T);
  memcpy(data,rec,ds);
diff -ru RHIDE_orig/tvision/classes/unix/unixscr.cc RHIDE/tvision/classes/unix/unixscr.cc
--- RHIDE_orig/tvision/classes/unix/unixscr.cc	2003-12-02 07:29:25.000000000 -0600
+++ RHIDE/tvision/classes/unix/unixscr.cc	2011-12-23 17:22:59.598559631 -0600
@@ -921,7 +921,8 @@
 //int blink_use_bios = 1;
 //int save_text_palette = 0;
 
-/*void setIntenseState()
+// /*
+void setIntenseState()
 {
 }
 
@@ -932,8 +933,10 @@
 int getBlinkState()
 { // SET: 1 means blink enabled and hence only 8 colors (was a bug)
   // Report it according to the mode (vcs v.s. tty)
-  return canWriteVCS() ? 1 : 0;
-}*/
+  //return canWriteVCS() ? 1 : 0;
+  return 0;
+}
+// */
 
 /*****************************************************************************
 
diff -ru RHIDE_orig/tvision/examples/bhelp/thelp.cc RHIDE/tvision/examples/bhelp/thelp.cc
--- RHIDE_orig/tvision/examples/bhelp/thelp.cc	2003-06-05 14:34:43.000000000 -0500
+++ RHIDE/tvision/examples/bhelp/thelp.cc	2011-12-23 16:06:28.634680905 -0600
@@ -30,6 +30,7 @@
 #define Uses_MsgBox
 #include <tv.h>
 #include "bhelp.h"
+#include <string.h>
 
 class THelp:public TApplication
 {
diff -ru RHIDE_orig/tvision/examples/dlgdsn/consted.cc RHIDE/tvision/examples/dlgdsn/consted.cc
--- RHIDE_orig/tvision/examples/dlgdsn/consted.cc	2003-06-05 14:34:43.000000000 -0500
+++ RHIDE/tvision/examples/dlgdsn/consted.cc	2011-12-23 16:02:13.978687599 -0600
@@ -155,7 +155,7 @@
 
 static Boolean valueMatch(void * item, void *value)
 {
-   return (((TConstData *)item)->Value == (int)value);
+   return (((TConstData *)item)->Value == *(int*)&value);
 }
 
 int TConstCollection::getIndex(char * Ident)
diff -ru RHIDE_orig/tvision/examples/dlgdsn/propedit.cc RHIDE/tvision/examples/dlgdsn/propedit.cc
--- RHIDE_orig/tvision/examples/dlgdsn/propedit.cc	2003-10-27 06:56:03.000000000 -0600
+++ RHIDE/tvision/examples/dlgdsn/propedit.cc	2011-12-23 16:05:38.446682125 -0600
@@ -754,7 +754,7 @@
 #define _do_(editor) chg = (execDialog(editor(), ldata) == cmOK); break;
 #define _constsel_(list, editor)                                             \
           rec.items = list();                                                \
-          rec.selection = list()->getIndex((ushort)(int)ldata);              \
+          rec.selection = list()->getIndex((ushort)*(int*)&ldata);              \
           chg = (execDialog(editor(), &rec) == cmOK);                        \
           if (chg) memcpy(ldata, &rec.selection, sizeof(ushort)); break;
 
@@ -791,10 +791,10 @@
        case etIntegerEditor:
           calcPlace(place, separator, map->index, dataMap);
           if (vtCurrent == vtListBox && map->index == 14)
-               i = (short)(int)ldata; else i = (int)ldata;
+               i = (short)*(int*)&ldata; else i = *(int*)&ldata;
           chg = IntegerEditor(i, place, owner);
           if (vtCurrent == vtListBox && map->index == 14)
-             ldata = (void *)i; else ldata = (void *)i;
+             ldata = *(void **)&i; else ldata = *(void **)&i;
           if (chg) message(owner, evMessage, cmValueChanged, 0);
        break;
        case etOptionsEditor: _do_(OptionsEditor);
diff -ru RHIDE_orig/tvision/include/tv/inputln.h RHIDE/tvision/include/tv/inputln.h
--- RHIDE_orig/tvision/include/tv/inputln.h	2004-08-17 08:18:43.000000000 -0500
+++ RHIDE/tvision/include/tv/inputln.h	2011-12-23 00:08:09.588199181 -0600
@@ -165,9 +165,15 @@
 class TInputLineBaseT: public TInputLineBase
 {
 public:
- TInputLineBaseT(const TRect& bounds, int aMaxLen);
+ TInputLineBaseT(const TRect& bounds, int aMaxLen)
+  : TInputLineBase(bounds,aMaxLen)
+ {
+  data=(char *)new T[aMaxLen];
+  *((T *)data)=EOS;
+  cellSize=sizeof(T);
+ }
 
- virtual void    setData(void *rec);
+ virtual void    setData(const void *rec);
  virtual void    setDataFromStr(void *str);
  virtual void    assignPos(int index, unsigned val);
  virtual Boolean pasteFromOSClipboard();
@@ -196,7 +202,7 @@
      { return name; }
 
 protected:
- TInputLine::TInputLine(StreamableInit) :
+ TInputLine(StreamableInit) :
    TInputLineBaseT<char,TDrawBuffer>(streamableInit) {}
 
 public:
diff -ru RHIDE_orig/tvision/include/tv/system.h RHIDE/tvision/include/tv/system.h
--- RHIDE_orig/tvision/include/tv/system.h	2001-11-24 18:41:44.000000000 -0600
+++ RHIDE/tvision/include/tv/system.h	2011-12-23 17:22:03.762561105 -0600
@@ -22,7 +22,11 @@
    know what you do.
 */
 
+/* However, this thing is not defined anywhere, and looks like it
+ * may have been replaced with TDisplay::dual_display. So let's
+ * scrap it.
 extern int dual_display;
+*/
 
 /* Event codes */
 
diff -ru RHIDE_orig/tvision/include/tv/textdev.h RHIDE/tvision/include/tv/textdev.h
--- RHIDE_orig/tvision/include/tv/textdev.h	2003-04-22 09:48:34.000000000 -0500
+++ RHIDE/tvision/include/tv/textdev.h	2011-12-20 23:10:39.617523069 -0600
@@ -13,6 +13,8 @@
  *
  */
 
+#include <cstdio>
+
 #if defined( Uses_TTextDevice ) && !defined( __TTextDevice )
 #define __TTextDevice
 
diff -ru RHIDE_orig/setedit/config.pl RHIDE/setedit/config.pl
--- RHIDE_orig/setedit/config.pl	2004-10-12 14:00:54.000000000 -0500
+++ RHIDE/setedit/config.pl	2011-12-24 01:42:00.729769007 -0600
@@ -194,6 +194,7 @@
    $MakeDefsRHIDE[1].='-l'.@conf{'mp3lib'}.' ' if (@conf{'mp3'} eq 'yes');
    $MakeDefsRHIDE[1].='-lintl ' if ((($OSf eq 'FreeBSD') || ($OSf eq 'QNXRtP')) && ($conf{'intl'} eq 'yes'));
    $MakeDefsRHIDE[1].='-laa ' if ($conf{'HAVE_AA'} eq 'yes');
+   $MakeDefsRHIDE[1].='-lXmu -lncurses -lgpm ';
   }
 else # Win32
   {
@@ -458,7 +459,7 @@
        $conf{'XCFLAGS'}=
        $conf{'XCXXFLAGS'}='-O3 -fomit-frame-pointer -ffast-math -gstabs+3';
        $conf{'CFLAGS'}=
-       $conf{'CXXFLAGS'}='-O2 -Wall -Werror -gstabs+3';
+       $conf{'CXXFLAGS'}='-O2 -Wall -gstabs+3';
       }
     elsif ($i eq '--with-mixer')
       {
diff -ru RHIDE_orig/setedit/configset RHIDE/setedit/configset
--- RHIDE_orig/setedit/configset	2003-05-26 09:01:58.000000000 -0500
+++ RHIDE/setedit/configset	2011-12-24 01:31:23.477785833 -0600
@@ -13,5 +13,5 @@
 read
 rm -f configure.cache
 rm -f Makefile
-perl config.pl --no-prefix-h --no-fhs --Xcppflags=-O3\ -fomit-frame-pointer\ -ffast-math --cflags=-O2\ -Wall\ -Werror\ -gstabs+3\ -pipe --cxxflags=-O2\ -Wall\ -Werror\ -gstabs+3\ -pipe --libset --enable-maintainer-mode $1 $2
+perl config.pl --no-prefix-h --no-fhs --Xcppflags=-O3\ -fomit-frame-pointer\ -ffast-math --cflags=-O2\ -Wall\ -gstabs+3\ -pipe --cxxflags=-O2\ -Wall\ -gstabs+3\ -pipe --libset --enable-maintainer-mode $1 $2
 
diff -ru RHIDE_orig/setedit/infview/infmain.cc RHIDE/setedit/infview/infmain.cc
--- RHIDE_orig/setedit/infview/infmain.cc	2004-09-06 11:21:12.000000000 -0500
+++ RHIDE/setedit/infview/infmain.cc	2011-12-26 21:42:24.863304182 -0600
@@ -349,13 +349,13 @@
  TSVeGroup *appEncode=NULL,*scrEncode=NULL,*inpEncode=NULL;
 
  appEncode=new TSVeGroup(
-   TSLabelCheck(__("~A~pplication"),__("Force encoding"),0),
+   TSLabelCheck(__("~A~pplication"),__("Force encoding"),(char*)0),
    new TSSortedListBox(wForced,height,tsslbVertical),
    0);
  appEncode->makeSameW();
 
  inpEncode=new TSVeGroup(
-   TSLabelCheck(__("~I~nput"),__("Force encoding"),0),
+   TSLabelCheck(__("~I~nput"),__("Force encoding"),(char*)0),
    new TSSortedListBox(wForced,height,tsslbVertical),
    0);
  inpEncode->makeSameW();
@@ -366,7 +366,7 @@
  if (TScreen::codePageVariable())
    {// Only if the code page is variable
     scrEncode=new TSVeGroup(
-      TSLabelCheck(__("~S~creen"),__("Force encoding"),0),
+      TSLabelCheck(__("~S~creen"),__("Force encoding"),(char*)0),
       new TSSortedListBox(wForced,height,tsslbVertical),
       0);
     scrEncode->makeSameW();
diff -ru RHIDE_orig/setedit/mainsrc/deedidia.cc RHIDE/setedit/mainsrc/deedidia.cc
--- RHIDE_orig/setedit/mainsrc/deedidia.cc	2004-06-25 10:37:32.000000000 -0500
+++ RHIDE/setedit/mainsrc/deedidia.cc	2011-12-26 21:43:39.439302214 -0600
@@ -245,7 +245,8 @@
  TSViewCol *col=new TSViewCol(__("Local Options"));
  SHL_Box=shlBox;
 
- TSLabel *Options=TSLabelCheck(2,__("Options ~3~"),__("~O~verwrite"),__("~A~utoindent"),
+ //TSLabel *Options=TSLabelCheck(2,__("Options ~3~"),__("~O~verwrite"),__("~A~utoindent"),
+ TSLabel *Options=TSLabelCheck(__("Options ~3~"),__("~O~verwrite"),__("~A~utoindent"),
          __("~U~se real tabs (ASCII 9)"),__("~P~ersistent blocks"),__("~I~ntelligent C indent"),
          __("~C~olumn cursor"),__("~R~ow cursor"),__("~M~atched pair highlighting"),
          __("Match pair on the fl~y~"),__("Don't wait to search for the pair ~1~"),
@@ -284,7 +285,8 @@
 {
  TSViewCol *col=new TSViewCol(__("Global Options"));
 
- TSLabel *Options=TSLabelCheck(2,__("Options"),
+ //TSLabel *Options=TSLabelCheck(2,__("Options"),
+ TSLabel *Options=TSLabelCheck(__("Options"),
           __("~A~utoindent"),
           __("~U~se tabs"),
           __("~P~ersistent blocks"),
@@ -306,7 +308,7 @@
           __("Keep trailin~g~ whitespace"),
           __("Backspace unindents ~8~"),
           __("Column markers ~9~"),
-         0);
+         (const char*)0);
  TSHzGroup *Inputs=MakeHzGroup(3,
             new TSHzLabel(__("~T~ab size"),new TSInputLine(3)),
             new TSHzLabel(__("Indent si~z~e"),new TSInputLine(3)),
@@ -366,7 +368,7 @@
                              __("Same ~b~ackground color as the editor"),
                              __("~M~onospaced font"),
                              __("Bo~l~d attribute"),
-                             __("~U~se CSS and HTML 4.01"),0),
+                             __("~U~se CSS and HTML 4.01"),(char*)0),
                 TSLabelRadio(__("Colors"),__("Use ~c~olors"),
                              __("~D~on't use colors"),0)
                 );
diff -ru RHIDE_orig/setedit/mainsrc/ssyntax.cc RHIDE/setedit/mainsrc/ssyntax.cc
--- RHIDE_orig/setedit/mainsrc/ssyntax.cc	2004-06-11 11:28:38.000000000 -0500
+++ RHIDE/setedit/mainsrc/ssyntax.cc	2011-12-26 21:43:32.587302395 -0600
@@ -477,13 +477,13 @@
  TSLabel *Method=TSLabelRadio(__("Search ~m~ethod"),__("E~x~act"),__("~S~ubstring"),
                               __("~F~uzzy"),0);
  TSLabel *Options=TSLabelCheck(__("Search O~p~tions"),__("~C~ase sensitive"),
-                               __("So~r~t by score"),0);
+                               __("So~r~t by score"),(char*)0);
  TSVeGroup *o1=new TSVeGroup(Method,Options);
 
  o1->Flags=wSpan;
  TSLabel *FuzzyV=new TSLabel(__("Fu~z~zy value [1..1000]"),new TSInputLine(5));
  
- TSLabel *oOptions=TSLabelCheck(__("Other options"),__("Search word in the ~t~opic"),0);
+ TSLabel *oOptions=TSLabelCheck(__("Other options"),__("Search word in the ~t~opic"),(char*)0);
 
  col->insert(2,1,o1);
  col->insert(2,yTSUnder,oOptions,0,o1);
diff -ru RHIDE_orig/setedit/setedit/debug.cc RHIDE/setedit/setedit/debug.cc
--- RHIDE_orig/setedit/setedit/debug.cc	2004-11-16 09:03:15.000000000 -0600
+++ RHIDE/setedit/setedit/debug.cc	2011-12-26 21:42:13.263304488 -0600
@@ -8069,7 +8069,7 @@
                 __("No gdb ~b~anner after connecting"),
                 __("Enable MI v2 ~f~eatures"),
                 __("No ~s~ymbols bug workaround"),
-                __("No source ~c~ode in disasm. window"),0),0);
+                __("No source ~c~ode in disasm. window"),(char*)0),0);
  o1->makeSameW();
 
  col->insert(xTSLeft,yTSUp,o1);
@@ -8150,7 +8150,7 @@
                           __("T~a~rget (not really implemented in gdb)"),
                           __("~L~og (gdb internal messages)"),
                           __("GDB/MI commands sent ~t~o gdb"),
-                          __("GDB/MI responses ~f~rom gdb"),0);
+                          __("GDB/MI responses ~f~rom gdb"),(char*)0);
 
  col->insert(xTSLeft,yTSUp,o1);
  EasyInsertOKCancel(col);
@@ -8199,7 +8199,7 @@
                           __("~W~atchpoints"),
                           __("W~a~tches"),
                           __("~I~nspectors"),
-                          __("~D~ata windows"),0));
+                          __("~D~ata windows"),(char*)0));
  EasyInsertOKCancel(col);
 
  TDialog *d=col->doItCenter(cmeDbgCleanElem);
diff -ru RHIDE_orig/setedit/setedit/edprefs.cc RHIDE/setedit/setedit/edprefs.cc
--- RHIDE_orig/setedit/setedit/edprefs.cc	2004-08-18 09:13:39.000000000 -0500
+++ RHIDE/setedit/setedit/edprefs.cc	2011-12-26 21:45:27.675299357 -0600
@@ -145,12 +145,12 @@
 
  // ACDEFGIKLNPRSW
  TSLabel *Sort=TSLabelRadio(__("~S~ort type"),__("~A~lphabetical"),
-                            __("~D~irectories first"),__("~F~iles first"),0);
+                            __("~D~irectories first"),__("~F~iles first"),(char*)0);
  d->sortType=(TRadioButtons32 *)Sort->linked->view;
  TSLabel *Case=TSLabelRadio(__("Case style"),__("~C~apital letters go first"),
-                            __("Case ~i~nsensitive"),0);
+                            __("Case ~i~nsensitive"),(char*)0);
  TSLabel *Parent=TSLabelRadio(__("Parent directory (..)"),__("First in the ~l~ist"),
-                              __("At the ~e~nd of the list"),0);
+                              __("At the ~e~nd of the list"),(char*)0);
  d->parentSort=Parent->linked->view;
  d->updateState(box.sortType);
 
@@ -161,9 +161,9 @@
  Grp1->makeSameW();
 
  TSLabel *DotFiles=TSLabelRadio(__("Files starting with a dot"),__("~N~ormally sorted"),
-                                __("After the ~r~est"),0);
+                                __("After the ~r~est"),(char*)0);
  TSLabel *Exclude=TSLabelCheck(__("Exclude files"),__("Ending ~w~ith tilde"),
-                               __("Ending with .bk~p~"),__("Startin~g~ with ."),0);
+                               __("Ending with .bk~p~"),__("Startin~g~ with ."),(char*)0);
 
  TSVeGroup *Grp2=MakeVeGroup(1,DotFiles,Exclude,0);
  Grp2->makeSameW();
@@ -354,7 +354,7 @@
  diaPrefs->xtOpt=extOptIn->view;
  TSLabel *extOpts=new TSLabel(__("E~x~ternal options"),extOptIn);
  TSVeGroup *Scrv=new TSVeGroup(
-   MakeVeGroup(0,TSLabelRadio(__("Sc~r~een saver (?)"),__("OF~F~"),__("O~N~"),0),
+   MakeVeGroup(0,TSLabelRadio(__("Sc~r~een saver (?)"),__("OF~F~"),__("O~N~"),(char*)0),
                scrv,extOpts,0), // First 3 joined
    MakeHzGroup(new TSButton(__("T~e~st"),cmTestScrv),
                new TSButton(__("~I~nfo"),cmInfoScrv),
@@ -455,10 +455,10 @@
               #define NO_RO_WARNING 512
               __("Open ~r~ead-only files as R.O. buffers"),
               #define RO_AS_RO 1024
-              0);
+              (char*)0);
 
- TSHzGroup *Clock=new TSHzGroup(TSLabelRadio(__("~C~lock"),__("OFF"),__("ON"),0),
-                                TSLabelRadio(__("St~y~le"),__("AM/PM"),__("24 hs"),0));
+ TSHzGroup *Clock=new TSHzGroup(TSLabelRadio(__("~C~lock"),__("OFF"),__("ON"),(char*)0),
+                                TSLabelRadio(__("St~y~le"),__("AM/PM"),__("24 hs"),(char*)0));
 
  TSHzLabel *MaxEds=new TSHzLabel(__("~M~ax. editor copies"),new TSInputLine(5));
  TSHzLabel *MaxClo=new TSHzLabel(__("Max. c~l~osed to remember"),new TSInputLine(5));
@@ -605,11 +605,11 @@
  TSViewCol *col=new TSViewCol(__("More desktop options"));
 
  TSLabel *editors=TSLabelRadio(__("Remember editor windows"),
-         __("~A~lways"),__("~O~nly if no file specified"),__("~N~ever"),0);
+         __("~A~lways"),__("~O~nly if no file specified"),__("~N~ever"),(char*)0);
  TSLabel *others=TSLabelRadio(__("Remember other windows"),
-         __("Al~w~ays"),__("On~l~y if no file specified"),__("Neve~r~"),0);
+         __("Al~w~ays"),__("On~l~y if no file specified"),__("Neve~r~"),(char*)0);
  TSLabel *closed=TSLabelRadio(__("Remember ~c~losed windows"),
-         __("Alway~s~"),__("Onl~y~ if no file specified"),__("Ne~v~er"),0);
+         __("Alway~s~"),__("Onl~y~ if no file specified"),__("Ne~v~er"),(char*)0);
 
  col->insert(xTSLeft,yTSUp,MakeVeGroup(0,editors,others,closed,0));
  col->insert(xTSCenter,yTSDown,
@@ -662,19 +662,19 @@
    TSLabelRadio(__("At the end of error list in message window"),
                 __("~J~ust stop"),
                 __("~I~ndicate with a message"),
-                __("Wrap (~c~ircular list)"),0),
+                __("Wrap (~c~ircular list)"),(char*)0),
    new TSCheckBoxes(new TSItem(__("Make a beep"),0)),
    TSLabelCheck(__("When creating message and similar windows"),
                 __("Use the ~v~ertical direction"),
-                __("Use the ~r~ight side"),0),
+                __("Use the ~r~ight side"),(char*)0),
    TSLabelRadio(__("When opening files"),
                 __("~U~se reserved width or 7 (hz dir)"),
-                __("~A~void message and project windows"),0),
+                __("~A~void message and project windows"),(char*)0),
    new TSHzLabel(__("Reserved ~w~idth"),new TSInputLine(5)),
    TSLabelRadio(__("Zoom windows when"),
                 __("No ~p~roject window"),
                 __("No prj. wi~n~dow or it's zoomed"),
-                __("A~l~ways"),0),
+                __("A~l~ways"),(char*)0),
    0);
  MsgWin->makeSameW();
 
@@ -866,13 +866,13 @@
  TSVeGroup *appEncode=NULL,*scrEncode=NULL,*sndEncode=NULL,*inpEncode=NULL;
 
  appEncode=new TSVeGroup(
-   TSLabelCheck(__("~A~pplication"),__("Force encoding"),0),
+   TSLabelCheck(__("~A~pplication"),__("Force encoding"),(char*)0),
    new TSSortedListBox(wForced,height,tsslbVertical),
    0);
  appEncode->makeSameW();
 
  inpEncode=new TSVeGroup(
-   TSLabelCheck(__("~I~nput"),__("Force encoding"),0),
+   TSLabelCheck(__("~I~nput"),__("Force encoding"),(char*)0),
    new TSSortedListBox(wForced,height,tsslbVertical),
    0);
  inpEncode->makeSameW();
@@ -883,7 +883,7 @@
  if (TScreen::codePageVariable())
    {// Only if the code page is variable
     scrEncode=new TSVeGroup(
-      TSLabelCheck(__("~S~creen"),__("Force encoding"),0),
+      TSLabelCheck(__("~S~creen"),__("Force encoding"),(char*)0),
       new TSSortedListBox(wForced,height,tsslbVertical),
       0);
     scrEncode->makeSameW();
@@ -891,7 +891,7 @@
     if (TScreen::canSetSBFont())
       {// Only if the secondary font exists
        sndEncode=new TSVeGroup(
-         TSLabelCheck(__("Second ~f~ont"),__("Force encoding"),0),
+         TSLabelCheck(__("Second ~f~ont"),__("Force encoding"),(char*)0),
          new TSSortedListBox(wForced,height,tsslbVertical),
          0);
        sndEncode->makeSameW();
@@ -1136,7 +1136,7 @@
  do
    {
     // Primary font label, check box and list
-    TSLabel *priLBl=TSLabelCheck(__("~P~rimary"),__("~L~oad font"),0);
+    TSLabel *priLBl=TSLabelCheck(__("~P~rimary"),__("~L~oad font"),(char*)0);
     TSVBitmapFontDescLBox *priLB=new TSVBitmapFontDescLBox(wForced,height-1,tsslbVertical);
     TSVeGroup *priOps=new TSVeGroup(priLBl,priLB,0);
     priOps->makeSameW();
@@ -1149,7 +1149,7 @@
     TSVeGroup *secOps=NULL;
     if (TScreen::canSetSBFont())
       {
-       secOps=new TSVeGroup(TSLabelCheck(__("~S~econdary"),__("Lo~a~d font"),0),
+       secOps=new TSVeGroup(TSLabelCheck(__("~S~econdary"),__("Lo~a~d font"),(char*)0),
                             new TSVBitmapFontDescLBox(wForced,height-1,tsslbVertical),0);
        secOps->makeSameW();
       }
@@ -1258,7 +1258,7 @@
              __("~S~ame as last run"),
              __("~E~xternal program"),
              __("~C~losest to specified size"),
-             __("Specified ~m~ode number"),0);
+             __("Specified ~m~ode number"),(char*)0);
    
     TSHzGroup *sizes=MakeHzGroup(
                 new TSVeGroup(new TSHzLabel(__("~W~idth "),new TSInputLine(5)),
@@ -1330,7 +1330,7 @@
               new TSHzLabel(__("Seconds between checks"),new TSInputLine(5)),
               TSLabelCheck(__("Related options"),
                            __("~D~on't check after executing an external program"),
-                           __("Don't check while ~i~dle"),0),
+                           __("Don't check while ~i~dle"),(char*)0),
               0));
  EasyInsertOKCancel(col);
  TDialog *d=col->doItCenter(cmeSetModiCkOps);
diff -ru RHIDE_orig/setedit/setedit/holidays.cc RHIDE/setedit/setedit/holidays.cc
--- RHIDE_orig/setedit/setedit/holidays.cc	2004-09-24 13:56:09.000000000 -0500
+++ RHIDE/setedit/setedit/holidays.cc	2011-12-26 21:39:04.331309477 -0600
@@ -315,7 +315,7 @@
     }
 
  col->insert(xTSCenter,yTSUp,
-             MakeVeGroup(tsveMakeSameW,TSLabelCheck(__("Country"),__("Force country"),0),
+             MakeVeGroup(tsveMakeSameW,TSLabelCheck(__("Country"),__("Force country"),(char*)0),
                          new TSRadioButtons(first),0));
  EasyInsertOKCancel(col);