diff options
Diffstat (limited to 'devel/nbitools/patches')
-rw-r--r-- | devel/nbitools/patches/patch-aa | 13 | ||||
-rw-r--r-- | devel/nbitools/patches/patch-ab | 13 | ||||
-rw-r--r-- | devel/nbitools/patches/patch-ac | 40 | ||||
-rw-r--r-- | devel/nbitools/patches/patch-ad | 44 | ||||
-rw-r--r-- | devel/nbitools/patches/patch-ae | 22 | ||||
-rw-r--r-- | devel/nbitools/patches/patch-af | 13 | ||||
-rw-r--r-- | devel/nbitools/patches/patch-ag | 55 | ||||
-rw-r--r-- | devel/nbitools/patches/patch-ah | 83 | ||||
-rw-r--r-- | devel/nbitools/patches/patch-ai | 13 | ||||
-rw-r--r-- | devel/nbitools/patches/patch-aj | 58 | ||||
-rw-r--r-- | devel/nbitools/patches/patch-ak | 14 | ||||
-rw-r--r-- | devel/nbitools/patches/patch-al | 13 | ||||
-rw-r--r-- | devel/nbitools/patches/patch-am | 23 | ||||
-rw-r--r-- | devel/nbitools/patches/patch-an | 23 | ||||
-rw-r--r-- | devel/nbitools/patches/patch-ao | 31 |
15 files changed, 0 insertions, 458 deletions
diff --git a/devel/nbitools/patches/patch-aa b/devel/nbitools/patches/patch-aa deleted file mode 100644 index 2843ac9c9bc..00000000000 --- a/devel/nbitools/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/06/03 09:53:47 sakamoto Exp $ - ---- include/Imakefile.orig Thu May 29 22:59:31 1997 -+++ include/Imakefile -@@ -14,7 +14,7 @@ - - BuildIncludes($(HEADERS),X11,..) - --InstallMultipleFlags($(HEADERS),$(INCDIR)/X11,$(INSTINCFLAGS)) -+InstallMultipleFlags($(HEADERS),$(INCDIR)/itools/X11,$(INSTINCFLAGS)) - - InstallLinkKitNonExecFile(X.h,$(LINKKITDIR)/include) - InstallLinkKitNonExecFile(Xmd.h,$(LINKKITDIR)/include) diff --git a/devel/nbitools/patches/patch-ab b/devel/nbitools/patches/patch-ab deleted file mode 100644 index 9e6e0faa765..00000000000 --- a/devel/nbitools/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2011/07/03 19:45:14 jym Exp $ - ---- config/extras/extras.tmpl.orig Thu May 29 22:59:30 1997 -+++ config/extras/extras.tmpl -@@ -16,7 +16,7 @@ - * version of xmkmf. Comment it out if you want to use the sh version. - */ - -- PERLPATH = /usr/local/bin/perl -+ PERLPATH = ${PREFIX}/bin/perl - - /*#define UsePerlImboot YES*/ - /*#define UsePerlXmkmf YES*/ diff --git a/devel/nbitools/patches/patch-ac b/devel/nbitools/patches/patch-ac deleted file mode 100644 index e2d98f9ce18..00000000000 --- a/devel/nbitools/patches/patch-ac +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2006/07/05 04:59:47 jlam Exp $ - ---- config/util/xmkmf.cpp.orig 1997-08-22 04:21:46.000000000 -0400 -+++ config/util/xmkmf.cpp -@@ -7,7 +7,7 @@ XCOMM $XConsortium: xmkmf.cpp /main/22 1 - - usage="usage: $0 [-a] [top_of_sources_pathname [current_directory]]" - --configdirspec=CONFIGDIRSPEC -+configdirspec="-I"CONFIGDIRSPEC - topdir= - curdir=. - do_all= -@@ -41,10 +41,16 @@ else - args="-I$topdir/config/cf -DTOPDIR=$topdir -DCURDIR=$curdir" - fi - --echo imake $args -+case "$IMAKE_CMD" in -+"") imake_cmd="BINDIRSPEC/imake" ;; -+*) imake_cmd="$IMAKE_CMD" ;; -+esac -+IMAKE_CMD="$imake_cmd"; export IMAKE_CMD -+ -+echo $imake_cmd $args - case "$do_all" in - yes) -- imake $args && -+ $imake_cmd $args && - echo "make Makefiles" && - make Makefiles && - echo "make includes" && -@@ -53,6 +59,6 @@ yes) - make depend - ;; - *) -- imake $args -+ $imake_cmd $args - ;; - esac diff --git a/devel/nbitools/patches/patch-ad b/devel/nbitools/patches/patch-ad deleted file mode 100644 index 9a85b3d4667..00000000000 --- a/devel/nbitools/patches/patch-ad +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2006/07/05 04:59:47 jlam Exp $ - ---- config/cf/Imake.tmpl.orig 2001-03-07 08:08:22.000000000 -0500 -+++ config/cf/Imake.tmpl -@@ -960,22 +960,22 @@ JPTCLIBDIR = JpTclLibDir - #define LoaderLibPrefix /**/ - #endif - #ifndef ImakeCmd --#ifdef UseInstalled /* assume BINDIR in path */ --#define ImakeCmd imake -+#ifdef UseInstalled /* Force use of itools' binary */ -+#define ImakeCmd $(BINDIR)/imake - #else - #define ImakeCmd $(IMAKESRC)/imake - #endif - #endif - #ifndef DependCmd - #if UseGccMakeDepend --#ifdef UseInstalled /* assume BINDIR in path */ --#define DependCmd gccmakedep -+#ifdef UseInstalled /* Force use of itools' binary */ -+#define DependCmd $(BINDIR)/gccmakedep - #else - #define DependCmd $(DEPENDSRC)/gccmakedep - #endif - #else --#ifdef UseInstalled /* assume BINDIR in path */ --#define DependCmd makedepend -+#ifdef UseInstalled /* Force use of itools' binary */ -+#define DependCmd $(BINDIR)/makedepend - #else - #define DependCmd $(DEPENDSRC)/makedepend - #endif -@@ -1001,8 +1001,8 @@ JPTCLIBDIR = JpTclLibDir - # endif - #endif - #ifndef MkdirHierCmd --#ifdef UseInstalled /* assume BINDIR in path */ --#define MkdirHierCmd mkdirhier -+#ifdef UseInstalled /* Force use of itools' binary */ -+#define MkdirHierCmd $(BINDIR)/mkdirhier - #else - #define MkdirHierCmd $(SHELL) $(CONFIGSRC)/util/mkdirhier.sh - #endif diff --git a/devel/nbitools/patches/patch-ae b/devel/nbitools/patches/patch-ae deleted file mode 100644 index 3a1af0929b6..00000000000 --- a/devel/nbitools/patches/patch-ae +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/06/03 09:53:47 sakamoto Exp $ - ---- config/cf/X11.tmpl.orig Thu Jan 21 21:50:39 1999 -+++ config/cf/X11.tmpl -@@ -628,7 +628,7 @@ - #endif - #ifndef BinDir - #ifdef ProjectRoot --#define BinDir Concat(ProjectRoot,/bin) -+#define BinDir Concat(ProjectRoot,/libexec/itools) - #else - #define BinDir /usr/bin/X11 - #endif -@@ -678,7 +678,7 @@ - #define BuildLibTop ../.. /* relative to BuildLibDir */ - #endif - #ifndef LibDir --#define LibDir $(USRLIBDIR)/X11 -+#define LibDir $(USRLIBDIR)/itools/X11 - #endif - #ifndef ConfigDir - #define ConfigDir $(LIBDIR)/config diff --git a/devel/nbitools/patches/patch-af b/devel/nbitools/patches/patch-af deleted file mode 100644 index 26c058f5aa7..00000000000 --- a/devel/nbitools/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.2 2004/04/29 18:59:25 minskim Exp $ - ---- config/util/Imakefile.orig Thu May 29 22:59:30 1997 -+++ config/util/Imakefile -@@ -37,7 +37,7 @@ - PerlScriptTarget(xmkmf,xmkmf.pl,NullParameter) - #else - AllTarget(ProgramTargetName(xmkmf)) --CppScriptTarget(ProgramTargetName(xmkmf),xmkmf.cpp,-DCONFIGDIRSPEC='"'"-I$(CONFIGDIR)"'"',$(ICONFIGFILES)) -+CppScriptTarget(ProgramTargetName(xmkmf),xmkmf.cpp,-DCONFIGDIRSPEC='"'"$(CONFIGDIR)"'"' -DBINDIRSPEC="$(BINDIR)",$(ICONFIGFILES)) - install:: install.ProgramTargetName(xmkmf) - InstallMultipleDestFlags(install.ProgramTargetName(xmkmf),ProgramTargetName(xmkmf),$(BINDIR),$(INSTBINFLAGS)) - #endif diff --git a/devel/nbitools/patches/patch-ag b/devel/nbitools/patches/patch-ag deleted file mode 100644 index 85ffd54aedc..00000000000 --- a/devel/nbitools/patches/patch-ag +++ /dev/null @@ -1,55 +0,0 @@ -$NetBSD: patch-ag,v 1.4 2006/02/25 17:31:57 schwarz Exp $ - ---- config/imake/imake.c.orig 2006-02-25 18:12:25.000000000 +0100 -+++ config/imake/imake.c 2006-02-25 18:15:10.000000000 +0100 -@@ -145,11 +145,13 @@ - * #include INCLUDE_IMAKEFILE - * <add any global targets like 'clean' and long dependencies> - */ --#if defined(__FreeBSD__) || defined(__NetBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__linux__) || defined(__DragonFly__) || defined(__sgi) || defined(sun) || defined(__sun) - /* This needs to be before _POSIX_SOURCE gets defined */ - # include <sys/param.h> - # include <sys/types.h> -+# if !defined(__sgi) && !defined(sun) && !defined(__sun) - # include <sys/sysctl.h> -+# endif - # include <sys/stat.h> - #endif - #include <stdio.h> -@@ -281,7 +283,7 @@ - * Xos.h, which we don't want to include here for bootstrapping reasons. - */ - #ifndef USE_STRERROR --# ifndef strerror -+# if !defined(strerror) && !defined(sun) && !defined(__sun) - extern char *sys_errlist[]; - extern int sys_nerr; - # define strerror(n) \ -@@ -1028,7 +1030,7 @@ - } - #endif - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__DragonFly__) - static void - get_binary_format(FILE *inFile) - { -@@ -1064,7 +1066,7 @@ - FILE* inFile; - { - static char* gcc_path[] = { --#if defined(linux) || defined(__OpenBSD__) -+#if defined(linux) || defined(__OpenBSD__) || defined(__DragonFly__) - "/usr/bin/cc", /* for Linux PostIncDir */ - #endif - "/usr/local/bin/gcc", -@@ -1161,7 +1163,7 @@ - get_ld_version(inFile); - #endif - get_gcc_incdir(inFile); --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__DragonFly__) - get_binary_format(inFile); - #endif - #endif /* WIN32 */ diff --git a/devel/nbitools/patches/patch-ah b/devel/nbitools/patches/patch-ah deleted file mode 100644 index 9945839a853..00000000000 --- a/devel/nbitools/patches/patch-ah +++ /dev/null @@ -1,83 +0,0 @@ -$NetBSD: patch-ah,v 1.4 2005/12/02 22:59:40 joerg Exp $ - ---- config/imake/imakemdep.h.orig 2002-02-12 13:36:00.000000000 -0600 -+++ config/imake/imakemdep.h -@@ -234,6 +234,11 @@ in this Software without prior written a - * If use cc -E but want a different compiler, define DEFAULT_CC. - * If the cpp you need is not in /lib/cpp, define DEFAULT_CPP. - */ -+ -+#if defined(__APPLE__) -+#define DEFAULT_CPP "/usr/bin/cpp" -+#define DEFAULT_CC "cc" -+#endif - #ifdef hpux - #define USE_CC_E - #endif -@@ -253,7 +258,7 @@ in this Software without prior written a - #if defined(sun) && (defined(SVR4) || defined(__svr4__) || defined(__SVR4) || defined(__sol__)) - #define DEFAULT_CPP "/usr/ccs/lib/cpp" - #endif --#ifdef __bsdi__ -+#if defined(__bsdi__) || defined(__APPLE__) - #define DEFAULT_CPP "/usr/bin/cpp" - #endif - #ifdef __uxp__ -@@ -268,7 +273,7 @@ in this Software without prior written a - #if defined(__386BSD__) || defined(__OpenBSD__) - #define DEFAULT_CPP "/usr/libexec/cpp" - #endif --#if defined(__FreeBSD__) || defined(__NetBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - #define USE_CC_E - #endif - #if defined(__sgi) && defined(__ANSI_CPP__) -@@ -326,7 +331,7 @@ char *cpp_argv[ARGUMENTS] = { - "-Uunix", /* remove unix symbol so that filename unix.c okay */ - #endif - #endif --#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH) || defined(linux) || defined(__GNU__) -+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH) || defined(linux) || defined(__GNU__) || defined(__DragonFly__) - # ifdef __i386__ - "-D__i386__", - # endif -@@ -639,6 +644,12 @@ char *cpp_argv[ARGUMENTS] = { - # define DEFAULT_OS_MINOR_REV "v %*d.%1s" - # define DEFAULT_OS_TEENY_REV "v %*d.%*c%[.0-9]" - # define DEFAULT_OS_NAME "srvm %[^\n]" -+# elif defined(__APPLE__) -+/* uname -v returns "x.yz" or "x.y.z", e.g. "2.02" or "2.1.2". */ -+# define DEFAULT_OS_MAJOR_REV "r %[0-9]" -+# define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]" -+# define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]" /* this will just get 0 */ -+# define DEFAULT_OS_NAME "s %[^\n]" - #elif defined(__osf__) - /* uname -r returns "Wx.y", e.g. "V3.2" or "T4.0" */ - # define DEFAULT_OS_MAJOR_REV "r %*[^0-9]%[0-9]" -@@ -662,14 +673,14 @@ char *cpp_argv[ARGUMENTS] = { - # define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]" - # define DEFAULT_OS_TEENY_REV "v %[0-9]" - /* # define DEFAULT_OS_NAME "srm %[^\n]" */ /* Not useful on ISC */ --#elif defined(__FreeBSD__) || defined(__OpenBSD__) -+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) - /* BSD/OS too? */ - /* uname -r returns "x.y[.z]-mumble", e.g. "2.1.5-RELEASE" or "2.2-0801SNAP" */ - # define DEFAULT_OS_MAJOR_REV "r %[0-9]" - # define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]" - # define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]" - # define DEFAULT_OS_NAME "srm %[^\n]" --# if defined(__FreeBSD__) -+# if defined(__FreeBSD__) || defined(__DragonFly__) - /* Use an alternate way to find the teeny version for -STABLE, -SNAP versions */ - # define DEFAULT_OS_TEENY_REV_FROB(buf, size) \ - do { \ -@@ -974,6 +985,9 @@ struct symtab predefs[] = { - #ifdef __FreeBSD__ - {"__FreeBSD__", "1"}, - #endif -+#ifdef __DragonFly__ -+ {"__DragonFly__", "1"}, -+#endif - #ifdef __OpenBSD__ - {"__OpenBSD__", "1"}, - #endif diff --git a/devel/nbitools/patches/patch-ai b/devel/nbitools/patches/patch-ai deleted file mode 100644 index 871858d13cf..00000000000 --- a/devel/nbitools/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2005/05/08 03:14:35 minskim Exp $ - ---- config/cf/Darwin.cf.orig 2001-07-02 22:54:07.000000000 -0500 -+++ config/cf/Darwin.cf -@@ -64,7 +64,7 @@ XCOMM operating system: OSName (OSMajor - #define IncludeMakefile(file) @@# dependencies are in .depend - #define DependFileName .depend - #ifndef ExtraLibraries --#define ExtraLibraries -lgnumalloc -+#define ExtraLibraries /* -lgnumalloc */ - #endif - #else - #define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF diff --git a/devel/nbitools/patches/patch-aj b/devel/nbitools/patches/patch-aj deleted file mode 100644 index 2f15d63939e..00000000000 --- a/devel/nbitools/patches/patch-aj +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2005/12/02 22:59:40 joerg Exp $ - ---- config/cf/Imake.cf.orig 2005-05-07 21:33:29.000000000 -0500 -+++ config/cf/Imake.cf -@@ -19,6 +19,21 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v - * 4. Create a .cf file with the name given by MacroFile. - */ - -+#if defined(__APPLE__) -+# undef __APPLE__ -+# define MacroIncludeFile <Darwin.cf> -+# define MacroFile Darwin.cf -+# define DarwinArchitecture -+# ifdef __ppc__ -+# define PpcDarwinArchitecture -+# undef __ppc__ -+# endif -+# ifdef __i386__ -+# define i386DarwinArchitecture -+# undef __i386__ -+# endif -+#endif -+ - #if defined(clipper) || defined(__clipper__) - # undef clipper - # define MacroIncludeFile <ingr.cf> -@@ -264,9 +279,30 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v - # define playstation2Architecture - # undef playstation2 - # endif -+# ifdef __x86_64__ -+# define AMD64Architecture -+# undef __x86_64__ -+# endif - #endif /* NetBSD */ - --#ifdef __FreeBSD__ -+#ifdef __DragonFly__ -+# define MacroIncludeFile <DragonFly.cf> -+# define MacroFile DragonFly.cf -+# undef __DragonFly__ -+# define DragonFlyArchitecture -+# define FreeBSDArchitecture -+# define KFreeBSDArchitecture -+# ifdef __i386__ -+# define i386BsdArchitecture -+# define i386Architecture -+# undef i386 -+# endif -+# ifdef __amd64__ -+# define AMD64Architecture -+# undef __amd64__ -+# undef __x86_64__ -+# endif -+#elif defined __FreeBSD__ - # define MacroIncludeFile <FreeBSD.cf> - # define MacroFile FreeBSD.cf - # undef __FreeBSD__ diff --git a/devel/nbitools/patches/patch-ak b/devel/nbitools/patches/patch-ak deleted file mode 100644 index 013eaf39e5e..00000000000 --- a/devel/nbitools/patches/patch-ak +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2005/12/02 22:59:40 joerg Exp $ - ---- config/cf/Imakefile.orig 2002-05-28 15:48:03.000000000 +0000 -+++ config/cf/Imakefile -@@ -46,7 +46,8 @@ sunLib.rules \ - sv3Lib.rules \ - sv4Lib.rules \ - QNX.rules \ --xf86.rules -+xf86.rules \ -+DragonFly.cf - - TMPLFILES = \ - Imake.tmpl \ diff --git a/devel/nbitools/patches/patch-al b/devel/nbitools/patches/patch-al deleted file mode 100644 index d9a231d3cf4..00000000000 --- a/devel/nbitools/patches/patch-al +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-al,v 1.1 2005/12/02 22:59:40 joerg Exp $ - ---- config/cf/bsdLib.rules.orig 1999-07-21 12:01:05.000000000 +0000 -+++ config/cf/bsdLib.rules -@@ -173,7 +173,7 @@ LintLibReferences(varname,libname,libsou - * InstallSharedLibrary - generate rules to install the shared library. - * NOTE: file must be executable, hence "INSTBINFLAGS" - */ --#ifndef FreeBSDArchitecture -+#if !defined(FreeBSDArchitecture) && !defined(__DragonFly__) - #ifndef InstallSharedLibrary - #define InstallSharedLibrary(libname,rev,dest) @@\ - install:: Concat(lib,libname.so.rev) @@\ diff --git a/devel/nbitools/patches/patch-am b/devel/nbitools/patches/patch-am deleted file mode 100644 index 72a296c752e..00000000000 --- a/devel/nbitools/patches/patch-am +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-am,v 1.1 2010/11/25 15:17:51 hauke Exp $ - -One of the three patches replacing the distribution patch -under work/nbitools-R6.3/config/md.patch - ---- config/makedepend/def.h.orig 1997-08-22 08:21:35.000000000 +0000 -+++ config/makedepend/def.h -@@ -1,5 +1,6 @@ - /* $XConsortium: def.h /main/30 1996/12/04 10:11:12 swick $ */ - /* $XFree86: xc/config/makedepend/def.h,v 3.3 1997/01/12 10:38:17 dawes Exp $ */ -+ - /* - - Copyright (c) 1993, 1994 X Consortium -@@ -137,7 +138,7 @@ char *realloc(); - - char *copy(); - char *base_name(); --char *getline(); -+char *mdgetline(); - struct symtab **slookup(); - struct symtab **isdefined(); - struct symtab **fdefined(); diff --git a/devel/nbitools/patches/patch-an b/devel/nbitools/patches/patch-an deleted file mode 100644 index ab0812a5412..00000000000 --- a/devel/nbitools/patches/patch-an +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-an,v 1.1 2010/11/25 15:17:51 hauke Exp $ - -One of the three patches replacing the distribution patch -under work/nbitools-R6.3/config/md.patch - ---- config/makedepend/main.c.orig 1997-08-22 08:21:36.000000000 +0000 -+++ config/makedepend/main.c -@@ -1,5 +1,6 @@ - /* $XConsortium: main.c /main/84 1996/12/04 10:11:23 swick $ */ - /* $XFree86: xc/config/makedepend/main.c,v 3.11.2.1 1997/05/11 05:04:07 dawes Exp $ */ -+ - /* - - Copyright (c) 1993, 1994 X Consortium -@@ -548,7 +549,7 @@ match(str, list) - * Get the next line. We only return lines beginning with '#' since that - * is all this program is ever interested in. - */ --char *getline(filep) -+char *mdgetline(filep) - register struct filepointer *filep; - { - register char *p, /* walking pointer */ diff --git a/devel/nbitools/patches/patch-ao b/devel/nbitools/patches/patch-ao deleted file mode 100644 index 448617ffe6f..00000000000 --- a/devel/nbitools/patches/patch-ao +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2010/11/25 15:17:51 hauke Exp $ - -One of the three patches replacing the distribution patch -under work/nbitools-R6.3/config/md.patch - ---- config/makedepend/parse.c.orig 1997-08-22 08:21:37.000000000 +0000 -+++ config/makedepend/parse.c -@@ -1,4 +1,5 @@ - /* $XConsortium: parse.c /main/33 1996/12/04 10:11:28 swick $ */ -+ - /* - - Copyright (c) 1993, 1994 X Consortium -@@ -40,7 +41,7 @@ gobble(filep, file, file_red) - register char *line; - register int type; - -- while (line = getline(filep)) { -+ while (line = mdgetline(filep)) { - switch(type = deftype(line, filep, file_red, file, FALSE)) { - case IF: - case IFFALSE: -@@ -529,7 +530,7 @@ find_includes(filep, file, file_red, rec - register int type; - boolean recfailOK; - -- while (line = getline(filep)) { -+ while (line = mdgetline(filep)) { - switch(type = deftype(line, filep, file_red, file, TRUE)) { - case IF: - doif: |