From 94cba197d56eaf4bbae8f67ec30c3722aa6e6b60 Mon Sep 17 00:00:00 2001
From: Liang Chang <l-chang@users.sourceforge.net>
Date: Sun, 17 Oct 2021 09:05:43 -0600
Subject: [PATCH] dtudcfonted: use libXpm directly.

---
 cde/programs/dtudcfonted/cpyx.c | 6 +-----
 cde/programs/dtudcfonted/util.c | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/cde/programs/dtudcfonted/cpyx.c b/cde/programs/dtudcfonted/cpyx.c
index 93ae38251..45411a6c5 100644
--- a/cde/programs/dtudcfonted/cpyx.c
+++ b/cde/programs/dtudcfonted/cpyx.c
@@ -38,6 +38,7 @@
 #include<X11/Xlib.h>
 #include<X11/Xutil.h>
 #include<X11/Xatom.h>
+#include<X11/xpm.h>
 
 #include <Xm/XmAll.h>
 
@@ -54,12 +55,7 @@ extern XtPointer _XmStringUngenerate (XmString string,
 #include "selectxlfd.h"
 #include "xoakufont.h"
 
-#include "xpm.h"
-#ifdef XPM
 #define ReadXpm XpmCreatePixmapFromData
-#else
-#define ReadXpm _DtXpmCreatePixmapFromData
-#endif
 #include "pixmaps/arrow.pm"
 
 static Widget	CreateCopyXLFD(Widget Top);
diff --git a/cde/programs/dtudcfonted/util.c b/cde/programs/dtudcfonted/util.c
index 33e9eab5b..fb175edac 100644
--- a/cde/programs/dtudcfonted/util.c
+++ b/cde/programs/dtudcfonted/util.c
@@ -34,6 +34,7 @@
 
 #include <stdlib.h>
 #include <wchar.h>
+#include <X11/xpm.h>
 #include <Xm/XmAll.h>
 #include <Xm/RowColumn.h>
 #include <Xm/MainW.h>
@@ -51,7 +52,6 @@ void _unmap( Widget w, XtPointer closure, XtPointer call_data);
 
 extern Resource resource ;
 
-#include "xpm.h"
 #include "pixmaps/Pencil.pm"
 #include "pixmaps/Line.pm"
 #include "pixmaps/Rectangle.pm"
@@ -59,11 +59,7 @@ extern Resource resource ;
 #include "pixmaps/Eraser.pm"
 #include "pixmaps/SelectArea.pm"
 
-#ifdef XPM
 #define ReadXpm XpmCreatePixmapFromData
-#else
-#define ReadXpm _DtXpmCreatePixmapFromData
-#endif
 #define NUMPIX 6
 
 #include "pixmaps/arrow.pm"