Skip to content

Commit

Permalink
Merge pull request #193 from oneru/mingw32-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mrash committed Jan 15, 2016
2 parents 8bb46f9 + c0ad757 commit dbd5ae7
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
4 changes: 4 additions & 0 deletions configure.ac
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions lib/Makefile.am
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion lib/fko_user.c
Expand Up @@ -30,7 +30,9 @@
#include "fko_common.h"
#include "fko.h"

#ifdef WIN32
#ifdef __MINGW32__
#include "../win32/getlogin.h"
#elif WIN32
#include <getlogin.h>
#endif

Expand Down

0 comments on commit dbd5ae7

Please sign in to comment.