From 2215ee37e961b0660161a63bcb9d5ebfaa7f04e7 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 13 Mar 2023 15:27:10 +0100 Subject: [PATCH] GNUmakefile: move HAVE_STRTOLL to libssh2_config.h [ci skip] (#844) --- win32/GNUmakefile | 6 +----- win32/libssh2_config.h | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/win32/GNUmakefile b/win32/GNUmakefile index 1678c4ea..bf2cfe22 100644 --- a/win32/GNUmakefile +++ b/win32/GNUmakefile @@ -49,10 +49,6 @@ endif CPPFLAGS += -I$(PROOT)/win32 -I$(PROOT)/include RCFLAGS += -I$(PROOT)/include -# src - -CPPFLAGS_LIB := -DHAVE_STRTOLL - # examples, tests LIBSSH2_LDFLAGS_BIN += -L$(PROOT)/win32 @@ -186,7 +182,7 @@ test: $(TARGETS_EXAMPLES) $(CC) -W -Wall $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LIBSSH2_LDFLAGS_BIN) $< -o $@ $(LIBS) $(LIBS_BIN) $(OBJDIR)/%.o: %.c - $(CC) -W -Wall $(CFLAGS) $(CPPFLAGS) $(CPPFLAGS_LIB) -c $< -o $@ + $(CC) -W -Wall $(CFLAGS) $(CPPFLAGS) -c $< -o $@ $(libssh2_dll_LIBRARY) $(libssh2_dll_a_LIBRARY): $(OBJS) $(OBJDIR)/$(TARGET).res @$(call DEL, $@) diff --git a/win32/libssh2_config.h b/win32/libssh2_config.h index a497eab5..ac056b21 100644 --- a/win32/libssh2_config.h +++ b/win32/libssh2_config.h @@ -20,6 +20,7 @@ # define HAVE_INTTYPES_H # define HAVE_SYS_TIME_H # define HAVE_GETTIMEOFDAY +# define HAVE_STRTOLL #elif defined(_MSC_VER) # if _MSC_VER < 1900 # undef HAVE_SNPRINTF