Merge pull request #2831 from razzfazz/fix_dllimport
authorAlexander Köplinger <alex.koeplinger@outlook.com>
Tue, 5 Apr 2016 13:04:31 +0000 (15:04 +0200)
committerAlexander Köplinger <alex.koeplinger@outlook.com>
Tue, 5 Apr 2016 13:04:31 +0000 (15:04 +0200)
clean up DllImport attributes

1  2 
mcs/class/System/System.IO/KeventWatcher.cs

index b2d964ceb5e0cc451618a2dfc914fd78f8dbc446,5cc8a377356c8313510316d60479b2cb2f5dc31f..8078964da30ea9f5e252b24e710e5131ea7de5b5
@@@ -150,7 -150,7 +150,7 @@@ namespace System.IO 
        [StructLayout(LayoutKind.Sequential)]
        struct timespec {
                public IntPtr tv_sec;
 -              public IntPtr tv_usec;
 +              public IntPtr tv_nsec;
        }
  
        class PathData
  
                        Scan (fullPathNoLastSlash, false, ref initialFds);
  
 -                      var immediate_timeout = new timespec { tv_sec = (IntPtr)0, tv_usec = (IntPtr)0 };
 +                      var immediate_timeout = new timespec { tv_sec = (IntPtr)0, tv_nsec = (IntPtr)0 };
                        var eventBuffer = new kevent[0]; // we don't want to take any events from the queue at this point
                        var changes = CreateChangeList (ref initialFds);
  
                string fixupPath = null;
                string fullPathNoLastSlash = null;
  
-               [DllImport ("libc", EntryPoint="fcntl", CharSet=CharSet.Auto, SetLastError=true)]
+               [DllImport ("libc", CharSet=CharSet.Auto, SetLastError=true)]
                static extern int fcntl (int file_names_by_descriptor, int cmd, StringBuilder sb);
  
-               [DllImport ("libc")]
+               [DllImport ("libc", SetLastError=true)]
                extern static int open (string path, int flags, int mode_t);
  
                [DllImport ("libc")]
                extern static int close (int fd);
  
-               [DllImport ("libc")]
+               [DllImport ("libc", SetLastError=true)]
                extern static int kqueue ();
  
-               [DllImport ("libc")]
+               [DllImport ("libc", SetLastError=true)]
                extern static int kevent (int kq, [In]kevent[] ev, int nchanges, [Out]kevent[] evtlist, int nevents, [In] ref timespec time);
  
                [MethodImplAttribute(MethodImplOptions.InternalCall)]