2002-02-16 Jeffrey Stedfast <fejj@ximian.com>

	* wrapper.c (mono_wrapper_fstat): The MonoWrapperStat namespace is
	mst_ now, so update this code. Also fix a copy/paste-o that
	assigned st.st_ctime to buf->mst_mtime.
	(mono_wrapper_stat): Same here.

	* genwrapper.pl: Solaris does some nasty macro hadckery action for
	st_[a,c,m]time and so lets namespace our wrapper members as
	mst_[a,c,m]time to avoid namespace problems.

svn path=/trunk/mono/; revision=2453

diff --git a/mono/wrapper/ChangeLog b/mono/wrapper/ChangeLog
index c62c4f2b3711adefb26876b47ecc98db13699206..465cc6edfa0b115af527756bf224d2a5e7d89dae 100644 (file)
--- a/mono/wrapper/ChangeLog
+++ b/mono/wrapper/ChangeLog
@@ -1,3 +1,13 @@
+2002-02-16  Jeffrey Stedfast  <fejj@ximian.com>
+
+       * wrapper.c (mono_wrapper_fstat): The MonoWrapperStat namespace is
+       mst_ now, so update this code. Also fix a copy/paste-o that
+       assigned st.st_ctime to buf->mst_mtime.
+       (mono_wrapper_stat): Same here.
+
+       * genwrapper.pl: Solaris does some nasty macro hadckery action for
+       st_[a,c,m]time and so lets namespace our wrapper members as
+       mst_[a,c,m]time to avoid namespace problems.
 
 Sun Feb 10 14:18:50 CET 2002 Paolo Molaro <lupus@ximian.com>
 

diff --git a/mono/wrapper/genwrapper.pl b/mono/wrapper/genwrapper.pl
index 4a2c631f71fe500fb13b9766a0bfb7027bf67f06..15641aa59dcba3c484c5fd82ace9ffa2155e309c 100755 (executable)
--- a/mono/wrapper/genwrapper.pl
+++ b/mono/wrapper/genwrapper.pl
@@ -25,15 +25,15 @@ if ($csmode){
    $res_struct .= "[CLSCompliant(false)]\n";
 }
 create_struct ("MonoWrapperStat", "stat",
-              "uint", "st_dev",
-              "uint", "st_mode",
-              "uint", "st_nlink",
-              "uint", "st_uid",
-              "uint", "st_gid",
-              "long", "st_size",
-              "uint", "st_atime",
-              "uint", "st_mtime",
-              "uint", "st_ctime",
+              "uint", "mst_dev",
+              "uint", "mst_mode",
+              "uint", "mst_nlink",
+              "uint", "mst_uid",
+              "uint", "mst_gid",
+              "long", "mst_size",
+              "uint", "mst_atime",
+              "uint", "mst_mtime",
+              "uint", "mst_ctime",
               );
 
 create_func ($lib, "", "seek", "long", 

diff --git a/mono/wrapper/wrapper.c b/mono/wrapper/wrapper.c
index 5d6e6752221a74420cb2fa3afc9a907af4727552..913ee10f7e8fd6170e9a69585a766632d6421895 100644 (file)
--- a/mono/wrapper/wrapper.c
+++ b/mono/wrapper/wrapper.c
@@ -54,15 +54,15 @@ mono_wrapper_fstat (gpointer fd, MonoWrapperStat* buf)
        if (fstat ((int)fd, &fs) == -1)
                return -errno;
 
-       buf->st_dev = fs.st_dev;
-       buf->st_mode = fs.st_mode;
-       buf->st_nlink = fs.st_nlink;
-       buf->st_uid = fs.st_uid;
-       buf->st_gid = fs.st_gid;
-       buf->st_size = fs.st_size;
-       buf->st_atime = fs.st_atime;
-       buf->st_mtime = fs.st_ctime;
-       buf->st_ctime = fs.st_ctime;
+       buf->mst_dev = fs.st_dev;
+       buf->mst_mode = fs.st_mode;
+       buf->mst_nlink = fs.st_nlink;
+       buf->mst_uid = fs.st_uid;
+       buf->mst_gid = fs.st_gid;
+       buf->mst_size = fs.st_size;
+       buf->mst_atime = fs.st_atime;
+       buf->mst_mtime = fs.st_mtime;
+       buf->mst_ctime = fs.st_ctime;
 
        return 0;
 }
@@ -101,15 +101,15 @@ mono_wrapper_stat (const char * path, MonoWrapperStat* buf)
        if (stat (path, &fs) != 0)
                return errno;
 
-       buf->st_dev = fs.st_dev;
-       buf->st_mode = fs.st_mode;
-       buf->st_nlink = fs.st_nlink;
-       buf->st_uid = fs.st_uid;
-       buf->st_gid = fs.st_gid;
-       buf->st_size = fs.st_size;
-       buf->st_atime = fs.st_atime;
-       buf->st_mtime = fs.st_ctime;
-       buf->st_ctime = fs.st_ctime;
+       buf->mst_dev = fs.st_dev;
+       buf->mst_mode = fs.st_mode;
+       buf->mst_nlink = fs.st_nlink;
+       buf->mst_uid = fs.st_uid;
+       buf->mst_gid = fs.st_gid;
+       buf->mst_size = fs.st_size;
+       buf->mst_atime = fs.st_atime;
+       buf->mst_mtime = fs.st_mtime;
+       buf->mst_ctime = fs.st_ctime;
 
        return 0;
 }