office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-09-21 00:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename xfopen to xdvi_xfopen as a bug reporter says this fixes the final problems

Browse source 
svn path=/trunk/kdegraphics/kdvi/; revision=80548
This commit is contained in:
Stephan Kulow 2001-01-29 11:06:33 +00:00
parent d8e21fb731
commit 2e35b575e2
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
font.cpp
View file

@ -13,7 +13,7 @@
#include "oconfig.h" #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 void oops(QString message);
extern int n_files_left; 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; kdDebug() << "FONT NAME RECEIVED:" << filename << endl;
file = xfopen(filename.latin1(), "r"); file = xdvi_xfopen(filename.latin1(), "r");
if (file == NULL) { if (file == NULL) {
kdError() << i18n("Can't find font ") << fontname << "." << endl; kdError() << i18n("Can't find font ") << fontname << "." << endl;
return; return;
@ -160,7 +160,7 @@ struct glyph *font::glyphptr(unsigned int ch) {
return NULL; /* previously flagged missing char */ return NULL; /* previously flagged missing char */
if (file == NULL) { if (file == NULL) {
file = xfopen(filename.latin1(), "r"); file = xdvi_xfopen(filename.latin1(), "r");
if (file == NULL) { if (file == NULL) {
oops(QString(i18n("Font file disappeared: %1")).arg(filename) ); oops(QString(i18n("Font file disappeared: %1")).arg(filename) );
return NULL; return NULL;

3
util.cpp
View file

@ -148,8 +148,7 @@ static void close_a_file()
/* /*
* Open a file in the given mode. * Open a file in the given mode.
*/ */
FILE *xdvi_xfopen(const char *filename, const char *type)
FILE *xfopen(const char *filename, const char *type)
#define TYPE type #define TYPE type
{ {
/* Try not to let the file table fill up completely. */ /* Try not to let the file table fill up completely. */

4
xdvi.h
View file

@ -12,10 +12,6 @@
* The C environment * * 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. */ /* For wchar_t et al., that the X files might want. */
extern "C" { extern "C" {
#include <sys/types.h> #include <sys/types.h>