* tests/Makefile.in: Correct order of libraries in LIBS.

	* include/io.h: Correct declarations for _findfirst/_findnext when
	not _HAVE_32BIT_TIME_T.

diff --git a/ChangeLog b/ChangeLog
index 61b2c60..bb79ad5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2013-02-25  Earnie Boyd  <earnie@usres.sourceforge.net>
 
        * NEWS: Add and adjust release notes for 4.0.
+       * tests/Makefile.in: Correct order of libraries in LIBS.
+       * include/io.h: Correct declarations for _findfirst/_findnext when
+       not _HAVE_32BIT_TIME_T.
 
 2013-02-24  Earnie Boyd  <earnie@users.sourceforge.net>
 

diff --git a/include/io.h b/include/io.h
index a745e5a..f86f883 100644 (file)
--- a/include/io.h
+++ b/include/io.h
@@ -109,23 +109,28 @@ struct _finddata64i32_t {
        _fsize_t        size;
        char            name[FILENAME_MAX];
 };
-#if defined(_USE_32BIT_TIME_T) && defined(_HAVE_32BIT_TIME_T)
+#if defined(_HAVE_32BIT_TIME_T)
+#if defined(_USE_32BIT_TIME_T)
 #define _finddata_t _finddata32_t
 #define _finddatai64_t _finddata32i64_t
 #define _findfirst _findfirst32
 #define _findnext _findnext32
 #define _findfirsti64 _findfirst32i64
 #define _findnexti64 _findnext32i64
-#else
+#else /* !_USE_32BIT_TIME_T */
 #define _finddata_t _finddata64i32_t
 #define _finddatai64_t __finddata64_t
 #define _findfirst _findfirst64i32
 #define _findnext _findnext64i32
 #define _findfirsti64 _findfirst64
 #define _findnexti64 _findnext64
-#endif
+#endif /* _USE_32BIT_TIME_T */
+#else /* !_HAVE_32BIT_TIME_T */
+#define _finddata_t _finddata64i32_t
+#define _finddatai64_t __finddata64_t
+#endif /* _HAVE_32BIT_TIME_T */
 #define _FINDDATA_T_DEFINED
-#endif
+#endif /* !_FINDDATA_T_DEFINED */
 
 #ifndef _WFINDDATA_T_DEFINED
 struct _wfinddata32_t {
@@ -164,7 +169,8 @@ struct _wfinddata64i32_t {
        __int32         size;
        wchar_t         name[FILENAME_MAX];
 };
-#if defined(_USE_32BIT_TIME_T) && defined(_HAVE_32BIT_TIME_T)
+#if defined(_HAVE_32BIT_TIME_T)
+#if defined(_USE_32BIT_TIME_T)
 #define _wfinddata_t _wfinddata32_t
 #define _wfinddatai64_t _wfinddata32i64_t
 #define _wfindfirst _wfindfirst32
@@ -179,8 +185,12 @@ struct _wfinddata64i32_t {
 #define _wfindfirsti64 _wfindfirst64
 #define _wfindnexti64 _wfindnext64
 #endif /* _USE_32BIT_TIME_T */
+#else /* ! _HAVE_32BIT_TIME_T */
+#define _wfinddata_t _wfinddata64i32_t
+#define _wfinddatai64_t _wfinddata64_t
+#endif /* _HAVE_32BIT_TIME_T */
 #define _WFINDDATA_T_DEFINED
-#endif
+#endif /* ! _WFINDDATA_T_DEFINED */
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 4e773bc..dc3d489 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -49,7 +49,7 @@ BEGIN = ../src/libcrt/crt/crt2.o `$(CC) -print-file-name=crtbegin.o`
 END = `$(CC) -print-file-name=crtend.o`
 
 LDFLAGS = -Bdynamic -nostdlib -L .. -L `$(CC) -print-file-name=`
-LIBS = -lmingw32 -lmoldname -lmingwex -lgcc -lmsvcrt -ladvapi32 -lshell32 -luser32 -lkernel32
+LIBS = -lmingwex -lmingw32 -lmoldname -lgcc -lmsvcrt -ladvapi32 -lshell32 -luser32 -lkernel32
 
 LIBFILES = ../libmingw32.a ../libmoldname.a ../libmingwex.a ../libmsvcrt.a \
   ../libadvapi32.a ../libshell32.a ../libuser32.a ../libkernel32.a