From 2e35b575e2b569102c8f19376888afe6eb864626 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@kde.org>
Date: Mon, 29 Jan 2001 11:06:33 +0000
Subject: [PATCH] rename xfopen to xdvi_xfopen as a bug reporter says this
 fixes the final problems

svn path=/trunk/kdegraphics/kdvi/; revision=80548
---
 font.cpp | 6 +++---
 util.cpp | 3 +--
 xdvi.h   | 4 ----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/font.cpp b/font.cpp
index 22b2aa337..4bc2de791 100644
--- a/font.cpp
+++ b/font.cpp
@@ -13,7 +13,7 @@
 
 #include "oconfig.h"
 
-extern FILE *xfopen(const char *filename, const char *type);
+extern FILE *xdvi_xfopen(const char *filename, const char *type);
 extern void oops(QString message);
 extern int n_files_left;
 
@@ -40,7 +40,7 @@ void font::font_name_receiver(KProcess *, char *buffer, int buflen)
 
   kdDebug() << "FONT NAME RECEIVED:" << filename << endl;
 
-  file = xfopen(filename.latin1(), "r");
+  file = xdvi_xfopen(filename.latin1(), "r");
   if (file == NULL) {
     kdError() << i18n("Can't find font ") << fontname << "." << endl;
     return;
@@ -160,7 +160,7 @@ struct glyph *font::glyphptr(unsigned int ch) {
       return NULL;	/* previously flagged missing char */
 
     if (file == NULL) {
-      file = xfopen(filename.latin1(), "r");
+      file = xdvi_xfopen(filename.latin1(), "r");
       if (file == NULL) {
 	oops(QString(i18n("Font file disappeared: %1")).arg(filename) );
 	return NULL;
diff --git a/util.cpp b/util.cpp
index ffa982bd7..05ac68681 100644
--- a/util.cpp
+++ b/util.cpp
@@ -148,8 +148,7 @@ static	void close_a_file()
 /*
  *	Open a file in the given mode.
  */
-
-FILE *xfopen(const char *filename, const char *type)
+FILE *xdvi_xfopen(const char *filename, const char *type)
 #define	TYPE	type
 {
   /* Try not to let the file table fill up completely.  */
diff --git a/xdvi.h b/xdvi.h
index a413248a3..939097a7f 100644
--- a/xdvi.h
+++ b/xdvi.h
@@ -12,10 +12,6 @@
  *	The C environment	*
  *******************************/
 
-/* Avoid name clashes with kpathsea.  */
-#define xmalloc xdvi_xmalloc
-#define xfopen xdvi_xfopen
-
 /* For wchar_t et al., that the X files might want. */
 extern "C" {
 #include <sys/types.h>