Forward to the past



Should anyone actually *be* interested in retrocomputing, here are the changes I made to mc 3.2.11 to get it to compile and run on a late-model 2.4 kernel and gcc 3.3 or 3.4.

- - 8< - -
-Pur virgin/mc-3.2.11/src/cons.handler.c mc-3.2.11/src/cons.handler.c
--- virgin/mc-3.2.11/src/cons.handler.c 1996-10-01 23:28:13.000000000 +0000
+++ mc-3.2.11/src/cons.handler.c    2007-10-19 10:53:44.000000000 +0000
@@ -169,7 +169,7 @@
        console_flag = 0;
    }
    break;
-    default:
+    default: ;
    /* Nothing */
    }
}
diff -Pur virgin/mc-3.2.11/src/key.c mc-3.2.11/src/key.c
--- virgin/mc-3.2.11/src/key.c    1996-10-01 23:28:03.000000000 +0000
+++ mc-3.2.11/src/key.c    2007-10-19 10:52:07.000000000 +0000
@@ -45,7 +45,7 @@
#include "file.h"
#include "../vfs/vfs.h"
#ifdef __linux__
-#  include <linux/termios.h> /* This is needed for TIOCLINUX */
+#  include <asm/ioctls.h> /* This is needed for TIOCLINUX */
#endif
#ifdef HAVE_TK
#   include <tcl.h>
diff -Pur virgin/mc-3.2.11/src/Makefile.in mc-3.2.11/src/Makefile.in
--- virgin/mc-3.2.11/src/Makefile.in    1996-10-01 23:28:20.000000000 +0000
+++ mc-3.2.11/src/Makefile.in    2007-10-19 11:23:05.000000000 +0000
@@ -58,7 +58,7 @@
    $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<

cons.saver: cons.saver.o
-    $(CC) -N -s cons.saver.o -o cons.saver
+    $(CC) -s cons.saver.o -o cons.saver

check:
    @echo no tests are supplied.
diff -Pur virgin/mc-3.2.11/src/util.c mc-3.2.11/src/util.c
--- virgin/mc-3.2.11/src/util.c    1996-10-01 23:28:00.000000000 +0000
+++ mc-3.2.11/src/util.c    2007-10-19 10:50:55.000000000 +0000
@@ -47,7 +47,7 @@
#endif

#ifdef __linux__
-#  include <linux/termios.h>    /* This is needed for TIOCLINUX */
+#  include <asm/ioctls.h>    /* This is needed for TIOCLINUX */
#  include <sys/ioctl.h>
#endif
#include "fs.h"
diff -Pur virgin/mc-3.2.11/src/utilunix.c mc-3.2.11/src/utilunix.c
--- virgin/mc-3.2.11/src/utilunix.c    1996-10-01 23:28:20.000000000 +0000
+++ mc-3.2.11/src/utilunix.c    2007-10-19 10:55:17.000000000 +0000
@@ -51,7 +51,7 @@
#   include <sys/timeb.h>
#endif
#ifdef __linux__
-#  include <linux/termios.h>    /* This is needed for TIOCLINUX */
+#  include <asm/ioctls.h>    /* This is needed for TIOCLINUX */
#  include <sys/ioctl.h>
#endif
#include "util.h"
diff -Pur virgin/mc-3.2.11/vfs/mcserv.c mc-3.2.11/vfs/mcserv.c
--- virgin/mc-3.2.11/vfs/mcserv.c    1996-10-01 23:25:32.000000000 +0000
+++ mc-3.2.11/vfs/mcserv.c    2007-10-19 10:44:14.000000000 +0000
@@ -660,7 +660,7 @@
    goto failed_pam;
    if ((status = pam_acct_mgmt (pamh, 0)) != PAM_SUCCESS)
    goto failed_pam;
-    if ((status = pam_setcred (pamh, PAM_CRED_ESTABLISH)) != PAM_SUCCESS)
+    if ((status = pam_setcred (pamh, PAM_ESTABLISH_CRED)) != PAM_SUCCESS)
    goto failed_pam;
    pam_end (pamh, status);
    return 0;
- - 8< - -

Reynir H. Stefánsson (reynirhs mi is)
--
"Math," Keitaro groaned. "Why did it have to be math?"

Needless to say, Keitaro and mathematics got along as well as Indiana
Jones and snakes.

       ("Love Hina Redux" by Ten-Faced Paladin)






[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]