From ff63c0593191c1203aa7bc85a75c41d7b6be67a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Thu, 11 Mar 1999 19:49:32 +0100
Subject: [PATCH] Renamed pnm.c to pnm_compat.c to avoid name conflict with
encodings/pnm.c.
Rev: src/modules/Image/Makefile.in:1.20
Rev: src/modules/Image/pnm.c:1.11(DEAD)
Rev: src/modules/Image/pnm_compat.c:1.1
---
.gitattributes | 2 +-
src/modules/Image/Makefile.in | 4 ++--
src/modules/Image/{pnm.c => pnm_compat.c} | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
rename src/modules/Image/{pnm.c => pnm_compat.c} (92%)
diff --git a/.gitattributes b/.gitattributes
index 6c2d5e3ed0..30a4d9102e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -190,7 +190,7 @@ testfont binary
/src/modules/Image/operator.c foreign_ident
/src/modules/Image/orient.c foreign_ident
/src/modules/Image/pattern.c foreign_ident
-/src/modules/Image/pnm.c foreign_ident
+/src/modules/Image/pnm_compat.c foreign_ident
/src/modules/Image/polyfill.c foreign_ident
/src/modules/Image/togif.c foreign_ident
/src/modules/Image/x.c foreign_ident
diff --git a/src/modules/Image/Makefile.in b/src/modules/Image/Makefile.in
index 3547a4f951..f8b1b95aba 100644
--- a/src/modules/Image/Makefile.in
+++ b/src/modules/Image/Makefile.in
@@ -1,7 +1,7 @@
-# $Id: Makefile.in,v 1.19 1999/03/01 21:47:47 hedda Exp $
+# $Id: Makefile.in,v 1.20 1999/03/11 18:49:32 grubba Exp $
SRCDIR=@srcdir@
VPATH=@srcdir@:@srcdir@/../..:../..
-OBJS = image.o font.o togif.o matrix.o pnm.o blit.o \
+OBJS = image.o font.o togif.o matrix.o pnm_compat.o blit.o \
pattern.o dct.o operator.o x.o colortable.o polyfill.o \
orient.o colors.o search.o
MODNAME=image
diff --git a/src/modules/Image/pnm.c b/src/modules/Image/pnm_compat.c
similarity index 92%
rename from src/modules/Image/pnm.c
rename to src/modules/Image/pnm_compat.c
index bc0c5cc5a3..9eaed973c9 100644
--- a/src/modules/Image/pnm.c
+++ b/src/modules/Image/pnm_compat.c
@@ -1,9 +1,9 @@
-/* $Id: pnm.c,v 1.10 1998/04/20 18:53:32 grubba Exp $ */
+/* $Id: pnm_compat.c,v 1.1 1999/03/11 18:49:30 grubba Exp $ */
/*
**! module Image
**! note
-**! $Id: pnm.c,v 1.10 1998/04/20 18:53:32 grubba Exp $
+**! $Id: pnm_compat.c,v 1.1 1999/03/11 18:49:30 grubba Exp $
**! class image
*/
--
GitLab