--- lavaps-1.20/linux/proc/compare.c.voins	1998-10-03 01:34:07 +0400
+++ lavaps-1.20/linux/proc/compare.c	2002-11-28 20:25:37 +0300
@@ -85,13 +85,13 @@
 */
 #define CMP_STR(NAME) \
 int cmp_ ## NAME(proc_t** P, proc_t** Q) { \
-    return strcmp((*P)-> ## NAME, (*Q)-> ## NAME); \
+    return strcmp((*P)->NAME, (*Q)->NAME); \
 }
 
 #define CMP_INT(NAME) \
 int cmp_ ## NAME (proc_t** P, proc_t** Q) { \
-    if ((*P)-> ## NAME < (*Q)-> ## NAME) return -1; \
-    if ((*P)-> ## NAME > (*Q)-> ## NAME) return  1; \
+    if ((*P)->NAME < (*Q)->NAME) return -1; \
+    if ((*P)->NAME > (*Q)->NAME) return  1; \
     return 0; \
 }
 
--- lavaps-1.20/linux/proc/version.c.voins	1998-10-03 01:34:07 +0400
+++ lavaps-1.20/linux/proc/version.c	2002-11-28 20:26:13 +0300
@@ -5,6 +5,7 @@
  * GNU Library General Public License; see ../COPYING.LIB
  */
 #include <stdio.h>
+#include <stdlib.h>
 
 #ifdef MINORVERSION
 char procps_version[] = "procps version " VERSION "." SUBVERSION "." MINORVERSION;
--- lavaps-1.20/tcl2cc/tcl2cc.c.voins	2000-06-06 05:04:15 +0400
+++ lavaps-1.20/tcl2cc/tcl2cc.c	2002-11-28 20:22:40 +0300
@@ -46,6 +46,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h> /* strcasecmp() */
 #include <ctype.h>
 
@@ -92,9 +93,7 @@
 {
 	int nl = 1;
 	int skipping = 0;
-	int c;
-	char buf[6];
-	int i;
+	int c = 0;
 	int look_forward = 0;
 
 	while (1) {
--- lavaps-1.20/main.cc.voins	2001-10-31 00:25:57 +0300
+++ lavaps-1.20/main.cc	2002-11-28 20:29:24 +0300
@@ -24,8 +24,8 @@
 #include "process_scan.hh"
 
 #include <unistd.h>
-#include <stdlib.h>
-#include <iostream.h>
+#include <cstdlib>
+#include <iostream>
 
 #include <string>
 
--- lavaps-1.20/blob.cc.voins	2001-08-15 19:15:58 +0400
+++ lavaps-1.20/blob.cc	2002-11-28 20:30:54 +0300
@@ -21,11 +21,11 @@
 
 #include "config.h"
 
-#include <stdio.h> // snprintf
+#include <cstdio> // snprintf
 
-#include <stdlib.h>  // atoi
-#include <iostream.h>
-#include <assert.h>
+#include <cstdlib>  // atoi
+#include <iostream>
+#include <cassert>
 
 #include <algorithm> // swap
 
--- lavaps-1.20/process_list.cc.voins	2001-08-15 19:16:19 +0400
+++ lavaps-1.20/process_list.cc	2002-11-28 20:30:29 +0300
@@ -21,8 +21,8 @@
 
 #include "config.h"
 
-#include <stdlib.h>  // atoi
-#include <iostream.h>
+#include <cstdlib>  // atoi
+#include <iostream>
 
 #include <unistd.h>
 #include <time.h>
--- lavaps-1.20/tcl_blob.cc.voins	2001-04-19 19:51:34 +0400
+++ lavaps-1.20/tcl_blob.cc	2002-11-28 20:37:59 +0300
@@ -21,9 +21,9 @@
 
 #ifdef USE_TCL_BLOB
 
-#include <stdlib.h>  // atoi
+#include <cstdlib>  // atoi
 #include <tcl.h>
-#include <iostream.h>
+#include <iostream>
 
 #include <signal.h>
 
@@ -334,7 +334,7 @@
 	// const char* appname = "lavaps";
 	interp_ = Tcl_CreateInterp();
 	if (Tcl_Init(interp_) == TCL_ERROR)
-		die(Tcl_GetStringResult(interp_));
+		die(const_cast<char*>(Tcl_GetStringResult(interp_)));
 	Tk_Window tk = NULL;
 	if (Tk_Init(interp_) == TCL_OK)
 		tk = Tk_MainWindow(interp_);
@@ -344,13 +344,21 @@
 	/*
 	 * add our new commands
 	 */
-	(void) Tcl_CreateCommand(interp_, "lava_tick", lava_tick_proc, NULL, NULL);
-	(void) Tcl_CreateCommand(interp_, "lava_id_to_info", lava_id_to_info_proc, NULL, NULL);
-	(void) Tcl_CreateCommand(interp_, "lava_menu", lava_menu_proc, NULL, NULL);
-	(void) Tcl_CreateCommand(interp_, "lava_resize", lava_resize_proc, NULL, NULL);
-	(void) Tcl_CreateCommand(interp_, "lava_dump", lava_dump_proc, NULL, NULL);
-	(void) Tcl_CreateCommand(interp_, "lava_version", lava_version_proc, NULL, NULL);
-	(void) Tcl_CreateCommand(interp_, "lava_default_resources", lava_default_resources_proc, NULL, NULL);
+	typedef int (*tmp_fun_type)(void*, Tcl_Interp*, int, const char**);
+	(void) Tcl_CreateCommand(interp_, "lava_tick",
+		reinterpret_cast<tmp_fun_type>(lava_tick_proc), NULL, NULL);
+	(void) Tcl_CreateCommand(interp_, "lava_id_to_info",
+		reinterpret_cast<tmp_fun_type>(lava_id_to_info_proc), NULL, NULL);
+	(void) Tcl_CreateCommand(interp_, "lava_menu",
+		reinterpret_cast<tmp_fun_type>(lava_menu_proc), NULL, NULL);
+	(void) Tcl_CreateCommand(interp_, "lava_resize",
+		reinterpret_cast<tmp_fun_type>(lava_resize_proc), NULL, NULL);
+	(void) Tcl_CreateCommand(interp_, "lava_dump",
+		reinterpret_cast<tmp_fun_type>(lava_dump_proc), NULL, NULL);
+	(void) Tcl_CreateCommand(interp_, "lava_version",
+		reinterpret_cast<tmp_fun_type>(lava_version_proc), NULL, NULL);
+	(void) Tcl_CreateCommand(interp_, "lava_default_resources",
+		reinterpret_cast<tmp_fun_type>(lava_default_resources_proc), NULL, NULL);
 	// (void) Tcl_CreateCommand(interp_, "lava_move", lava_move_proc, NULL, NULL);
 	// (void) Tcl_CreateCommand(interp_, "lava_grow", lava_grow_proc, NULL, NULL);
 	// (void) Tcl_CreateCommand(interp_, "lava_print", lava_print_proc, NULL, NULL);
@@ -589,7 +597,7 @@
 		exit (1);
 	};
 	if (dark_percentage_) {
-		char *cp = Tcl_GetStringResult(interp_);
+		const char *cp = Tcl_GetStringResult(interp_);
 		assert(cp != NULL);
 		assert(*cp != 0);
 		id_ = atoi(cp+1);
--- lavaps-1.20/tcl_blob_shape.cc.voins	2001-08-15 19:18:14 +0400
+++ lavaps-1.20/tcl_blob_shape.cc	2002-11-28 20:38:28 +0300
@@ -23,9 +23,9 @@
 
 #ifdef USE_TCL_BLOB
 
-#include <stdlib.h>  // atoi
+#include <cstdlib>  // atoi
 #include <tcl.h>
-#include <iostream.h>
+#include <iostream>
 
 #include <tcl.h>
 #include <tk.h>