From c0ad75704e0424c4cafa0ee37595ee45c15aef3c Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Fri, 15 Jan 2016 01:14:50 -0600 Subject: [PATCH] Fixes to allow for MINGW32 compilation --- configure.ac | 4 ++++ lib/Makefile.am | 5 +++++ lib/fko_user.c | 4 +++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1c77d6ef..96d9cc27 100644 --- a/configure.ac +++ b/configure.ac @@ -409,6 +409,10 @@ case "$host" in *-*-openbsd*) AC_DEFINE_UNQUOTED([PLATFORM_OPENBSD], [1], [Define if you are running on OpenBSD]) ;; +*-mingw32*) + AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system]) + AM_CONDITIONAL(MINGW, true) + ;; esac dnl Decide whether or not to build the client diff --git a/lib/Makefile.am b/lib/Makefile.am index d98e5177..16ce7161 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -10,6 +10,11 @@ libfko_source_files = \ sha1.h sha2.c sha2.h sha3.c sha3.h fko_context.h fko_state.h \ gpgme_funcs.c gpgme_funcs.h +if MINGW +libfko_source_files += ./common/common.h ../common/fko_util.c ../common/fko_util.h \ + ../common/strlcat.c ../common/strlcpy.c ../win32/getlogin.c ../common/netinet_common.h \ + ../win32/getlogin.h +endif if WANT_C_UNIT_TESTS libfko_la_LIBADD = $(top_builddir)/common/cunit_common.o diff --git a/lib/fko_user.c b/lib/fko_user.c index 446b8f20..f2255f41 100644 --- a/lib/fko_user.c +++ b/lib/fko_user.c @@ -30,7 +30,9 @@ #include "fko_common.h" #include "fko.h" -#ifdef WIN32 +#ifdef __MINGW32__ + #include "../win32/getlogin.h" +#elif WIN32 #include #endif