Browse Source

Check for sys/utime.h that fixes MSVC build.

svn path=/trunk/mono/; revision=102116
Kornél Pál 17 years ago
parent
commit
e031763ae2
5 changed files with 18 additions and 3 deletions
  1. 5 0
      ChangeLog
  2. 1 1
      configure.in
  3. 4 0
      mono/metadata/ChangeLog
  4. 4 1
      mono/metadata/appdomain.c
  5. 4 1
      winconfig.h

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+2008-04-29  Kornél Pál  <[email protected]>
+
+	* configure.in: Check for sys/utime.h.
+	* winconfig.h: Define HAVE_SYS_UTIME_H, undef HAVE_UTIME_H.
+
 2008-04-28  Zoltan Varga  <[email protected]>
 
 	* configure.in: Use lowercase for 'integrity of package' for consistency.

+ 1 - 1
configure.in

@@ -305,7 +305,7 @@ fi
 
 AM_CONDITIONAL(NO_VERSION_SCRIPT, test x$no_version_script = xyes)
 
-AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h)
+AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h)
 
 AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no])
 if test x$have_zlib = xyes; then

+ 4 - 0
mono/metadata/ChangeLog

@@ -1,3 +1,7 @@
+2008-04-29  Kornél Pál  <[email protected]>
+
+	* appdomain.c: Use HAVE_SYS_UTIME_H that fixes MSVC build.
+
 2008-04-28  Zoltan Varga  <[email protected]>
 
 	* image.c (mono_image_strong_name_position): Fix return value when the rva is

+ 4 - 1
mono/metadata/appdomain.c

@@ -20,6 +20,10 @@
 #include <sys/types.h>
 #ifdef HAVE_UTIME_H
 #include <utime.h>
+#else
+#ifdef HAVE_SYS_UTIME_H
+#include <sys/utime.h>
+#endif
 #endif
 
 #include <mono/metadata/gc-internal.h>
@@ -43,7 +47,6 @@
 #include <mono/utils/mono-stdlib.h>
 #include <mono/utils/mono-io-portability.h>
 #ifdef PLATFORM_WIN32
-#include <sys/utime.h>
 #include <direct.h>
 #endif
 

+ 4 - 1
winconfig.h

@@ -389,6 +389,9 @@
 /* Define to 1 if you have the <sys/un.h> header file. */
 /* #undef HAVE_SYS_UN_H */
 
+/* Define to 1 if you have the <sys/utime.h> header file. */
+#define HAVE_SYS_UTIME_H 1
+
 /* Define to 1 if you have the <sys/vfstab.h> header file. */
 /* #undef HAVE_SYS_VFSTAB_H */
 
@@ -417,7 +420,7 @@
 /* #undef HAVE_UNISTD_H */
 
 /* Define to 1 if you have the <utime.h> header file. */
-#define HAVE_UTIME_H 1
+/* #undef HAVE_UTIME_H */
 
 /* Define to 1 if you have the <valgrind/memcheck.h> header file. */
 /* #undef HAVE_VALGRIND_MEMCHECK_H */