Rearrange includes for finding inet_ntop on Windows

+ make sure stubby is linked with initial LDFLAGS (i.e. static) as well

configure.ac

@@ -1147,8 +1147,8 @@ AC_SUBST(INSTALL_STUBBY)
 AC_SUBST(UNINSTALL_STUBBY)
 AC_SUBST(STUBBY_XTRA_OBJS)
 
-STUBBY_LDFLAGS=""
 STUBBY_LIBS=""
+STUBBY_LDFLAGS=""
 
 if test $my_with_yaml = 1
 then
@@ -1156,8 +1156,8 @@ then
 	then
 		getdns_LIBS="$LIBS"
 		getdns_LDFLAGS="$LDFLAGS"
-		LIBS=""
+		LIBS="$initial_LIBS"
-		LDFLAGS=""
+		LDFLAGS="$initial_LDFLAGS"
 	fi
 	AC_ARG_WITH(libyaml, AS_HELP_STRING([--with-libyaml=pathname],
 		[path to libyaml (default: search /usr/local ..)]),
@@ -1350,21 +1350,6 @@ AH_BOTTOM([
 # ifndef FD_SETSIZE
 #  define FD_SETSIZE 1024
 # endif
-# define PRIsz "Iu"
-
- /* Windows wants us to use _strdup instead of strdup */
-# ifndef strdup
-#  define strdup _strdup
-# endif
-#else
-# define PRIsz "zu"
-#endif
-
-#include <stdint.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <assert.h>
-#include <string.h>
 
 /* the version of the windows API enabled */
 # ifndef WINVER
@@ -1373,14 +1358,24 @@ AH_BOTTOM([
 # ifndef _WIN32_WINNT
 #  define _WIN32_WINNT 0x0600 // 0x0502
 # endif
-#ifdef HAVE_WINSOCK2_H
-#include <winsock2.h>
-#endif
-
 # ifdef HAVE_WS2TCPIP_H
 #  include <ws2tcpip.h>
 # endif
 
+# ifdef _MSC_VER
+#  if _MSC_VER >= 1800
+#   define PRIsz "zu"
+#  else
+#   define PRIsz "Iu"
+#  endif
+# else
+#  define PRIsz "Iu"
+# endif
+
+# ifdef HAVE_WINSOCK2_H
+#  include <winsock2.h>
+# endif
+
 # ifndef USE_WINSOCK
 #  define ARG_LL "%ll"
 # else
@@ -1394,6 +1389,20 @@ AH_BOTTOM([
 #  define FD_SET_T 
 # endif
 
+ /* Windows wants us to use _strdup instead of strdup */
+# ifndef strdup
+#  define strdup _strdup
+# endif
+#else
+# define PRIsz "zu"
+#endif
+
+#include <stdint.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <assert.h>
+#include <string.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

src/convert.c

@@ -32,10 +32,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #include <locale.h>
-#include "config.h"
 #ifndef USE_WINSOCK
 #include <arpa/inet.h>
 #endif

src/dict.c

@@ -34,8 +34,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <ctype.h>
 #include "config.h"
+#include <ctype.h>
 #ifndef USE_WINSOCK
 #include <sys/types.h>
 #include <sys/socket.h>