From a42aa8c7a1b94ed78583c7e8ad35d7a9ee7efc94 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Fri, 25 Jan 2019 11:30:30 -0200
Subject: [PATCH] Fixing windows build.

---
 configure.ac               | 8 +++++---
 src/include/config.h.in    | 1 +
 src/include/lib3270.h      | 2 +-
 src/lib3270/Makefile.in    | 2 --
 src/lib3270/linux/util.c   | 2 +-
 src/lib3270/windows/util.c | 8 ++++----
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6573e32..2fe1fab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,7 +92,7 @@ case "$host" in
  	s390x-*)
 		CFLAGS="$CFLAGS -pthread"
 		LDFLAGS="$LDFLAGS -pthread"
-		app_cv_datadir="/usr/share"
+		app_cv_datadir="/usr/share/pw3270"
 		app_cv_confdir="/etc"
 		app_cv_osname="linux"
 		LOGDIR="/var/log"
@@ -101,7 +101,7 @@ case "$host" in
  	*)
 		CFLAGS="$CFLAGS -pthread"
 		LDFLAGS="$LDFLAGS -pthread"
-		app_cv_datadir="/usr/share"
+		app_cv_datadir="/usr/share/pw3270"
 		app_cv_confdir="/etc"
 		app_cv_osname="linux"
 		LOGDIR="/var/log"
@@ -109,7 +109,9 @@ case "$host" in
 
 esac
 
-AC_SUBST(DATADIR,$app_cv_datadir)
+AC_DEFINE_UNQUOTED(LIB3270_DATADIR,$app_cv_datadir)
+AC_SUBST(LIB3270_DATADIR,$app_cv_datadir)
+
 AC_SUBST(CONFDIR,$app_cv_confdir)
 AC_SUBST(OSNAME,$app_cv_osname)
 AC_SUBST(LIBS)
diff --git a/src/include/config.h.in b/src/include/config.h.in
index f803796..91d1424 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -38,6 +38,7 @@
 
 	/* Defaults */
 	#undef LIB3270_DEFAULT_HOST
+	#undef LIB3270_DATADIR
 
 	/* Libraries */
 	#undef HAVE_GNUC_VISIBILITY
diff --git a/src/include/lib3270.h b/src/include/lib3270.h
index 04e15e7..8a77413 100644
--- a/src/include/lib3270.h
+++ b/src/include/lib3270.h
@@ -1333,7 +1333,7 @@
 #endif // WIn32
 
 	/**
-	 * @brief Build filename on "DATADIR".
+	 * @brief Build filename on "LIB3270_DATADIR".
 	 *
 	 * @return Full path for the file (release it with lib3270_free).
 	 *
diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in
index db69cb6..7b94560 100644
--- a/src/lib3270/Makefile.in
+++ b/src/lib3270/Makefile.in
@@ -118,7 +118,6 @@ $(OBJDBG)/%.o: \
 		$(CFLAGS) \
 		-Wall -Wextra -fstack-check \
 		-DDEBUG=1 \
-		-DDATADIR=. \
 		-o $@ -c $<
 
 $(OBJDBG)/%.o: \
@@ -139,7 +138,6 @@ $(OBJRLS)/%.o: \
 	@$(CC) \
 		$(CFLAGS) \
 		-DNDEBUG=1 \
-		-DDATADIR=$(datarootdir)/pw3270 \
 		-o $@ -c $<
 
 $(OBJRLS)/%.o: \
diff --git a/src/lib3270/linux/util.c b/src/lib3270/linux/util.c
index bbffed8..208e315 100644
--- a/src/lib3270/linux/util.c
+++ b/src/lib3270/linux/util.c
@@ -38,5 +38,5 @@
 
 char * lib3270_build_data_filename(const char *name)
 {
-	return lib3270_strdup_printf("%s/%s",LIB3270_STRINGIZE_VALUE_OF(DATADIR),name);
+	return lib3270_strdup_printf("%s/%s",LIB3270_STRINGIZE_VALUE_OF(LIB3270_DATADIR),name);
 }
diff --git a/src/lib3270/windows/util.c b/src/lib3270/windows/util.c
index 4567c88..57d1d07 100644
--- a/src/lib3270/windows/util.c
+++ b/src/lib3270/windows/util.c
@@ -213,15 +213,15 @@ char * lib3270_build_data_filename(const char *name)
 	// https://github.com/GNOME/glib/blob/master/glib/gwin32.c
 
 	char *p;
-	wchar_t wc_fn[MAX_PATH];
+	char wc_fn[MAX_PATH];
 
-	if (!GetModuleFileNameW(NULL, wc_fn, MAX_PATH))
+	if (!GetModuleFileName(NULL, wc_fn, MAX_PATH))
 		return NULL;
 
-	if((p = strrchr (filename, '\\')) != NULL)
+	if((p = strrchr(wc_fn, '\\')) != NULL)
 		*p = '\0';
 
-	if((p = strrchr (filename, '/')) != NULL)
+	if((p = strrchr(wc_fn, '/')) != NULL)
 		*p = '\0';
 
 	return lib3270_strdup_printf("%s\\%s",wc_fn,name);
--
libgit2 0.21.2