From f1908d7ee5e2d2d44db2116b3c88213da9dfb854 Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat, 11 Dec 2004 16:14:05 +0000
Subject: Fix incomplete merge.

---
 src/RdFToI.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/RdFToI.c b/src/RdFToI.c
index 759535e..e91d5e9 100644
--- a/src/RdFToI.c
+++ b/src/RdFToI.c
@@ -259,15 +259,6 @@ static void
 xpmDataClose(mdata)
     xpmData *mdata;
 {
-    switch (mdata->type) {
-    case XPMFILE:
-      if (mdata->stream.file != (stdin))
-	  fclose(mdata->stream.file);
-      break;
-#ifndef NO_ZPIPE
-    case XPMPIPE:
-      pclose(mdata->stream.file);
-      break;
-#endif
-    }
+    if (mdata->stream.file != (stdin))
+	fclose(mdata->stream.file);
 }
-- 
cgit v1.2.1