[libview] Remove unneeded #ifdef

[evince.git] / backend / dvi / mdvi-lib / font.c

diff --git a/backend/dvi/mdvi-lib/font.c b/backend/dvi/mdvi-lib/font.c
index fedb7e78a595a580d8257c77f56971ce9f541d5f..2d488d625d8847e6bb447fdb8bf1bb57dda4d6f3 100644 (file)
--- a/backend/dvi/mdvi-lib/font.c
+++ b/backend/dvi/mdvi-lib/font.c
@@ -13,9 +13,10 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
  */
 

+#include <config.h>

 #include <stdlib.h>
 
 #include "mdvi.h"
 #include <stdlib.h>
 
 #include "mdvi.h"


@@ -35,7 +36,7 @@ int   font_reopen(DviFont *font)
 {
        if(font->in)
                fseek(font->in, (long)0, SEEK_SET);
 {
        if(font->in)
                fseek(font->in, (long)0, SEEK_SET);

-       else if((font->in = fopen(font->filename, "r")) == NULL) {
+       else if((font->in = fopen(font->filename, "rb")) == NULL) {

                DEBUG((DBG_FILES, "reopen(%s) -> Error\n", font->filename));
                return -1;
        }
                DEBUG((DBG_FILES, "reopen(%s) -> Error\n", font->filename));
                return -1;
        }


@@ -468,7 +469,7 @@ void        font_finish_definitions(DviContext *dvi)
        font_free_unused(&dvi->device);
 
        if(dvi->fonts == NULL) {
        font_free_unused(&dvi->device);
 
        if(dvi->fonts == NULL) {

-               warning(_("%s: no fonts defined\n"), dvi->filename);
+               mdvi_warning(_("%s: no fonts defined\n"), dvi->filename);

                return;
        }
        map = xnalloc(DviFontRef *, dvi->nfonts);
                return;
        }
        map = xnalloc(DviFontRef *, dvi->nfonts);