Răsfoiți Sursa

* map-icalls.h: Oddly, this file didn't get the new functions added in
2005-10-14 -- ToConfstrName, FromConfstrName, etc. Add them.
* map.c, map.h: Remove invalid enumeration value SyslogFacility.LOG_USRE.

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

Jonathan Pryor 20 ani în urmă
părinte
comite
6cb3969dea
4 a modificat fișierele cu 12 adăugiri și 6 ștergeri
  1. 6 0
      support/ChangeLog
  2. 6 0
      support/map-icalls.h
  3. 0 5
      support/map.c
  4. 0 1
      support/map.h

+ 6 - 0
support/ChangeLog

@@ -1,3 +1,9 @@
+2005-11-07  Jonathan Pryor  <[email protected]>
+
+	* map-icalls.h: Oddly, this file didn't get the new functions added in
+	  2005-10-14 -- ToConfstrName, FromConfstrName, etc.  Add them.
+	* map.c, map.h: Remove invalid enumeration value SyslogFacility.LOG_USRE.
+
 2005-10-14  Jonathan Pryor  <[email protected]>
 
 	* signal.c: Don't build Syscall wrappers on Win32.

+ 6 - 0
support/map-icalls.h

@@ -32,6 +32,7 @@ struct Mono_Posix_Utimbuf;
 int Mono_Posix_FromAccessMode (int value, int* rval);
 int Mono_Posix_FromAccessModes (int value, int* rval);
 int Mono_Posix_FromConfStr (int value, int* rval);
+int Mono_Posix_FromConfstrName (int value, int* rval);
 int Mono_Posix_FromDirectoryNotifyFlags (int value, int* rval);
 int Mono_Posix_FromErrno (int value, int* rval);
 int Mono_Posix_FromError (int value, int* rval);
@@ -48,12 +49,14 @@ int Mono_Posix_FromMremapFlags (guint64 value, guint64* rval);
 int Mono_Posix_FromMsyncFlags (int value, int* rval);
 int Mono_Posix_FromOpenFlags (int value, int* rval);
 int Mono_Posix_FromPathConf (int value, int* rval);
+int Mono_Posix_FromPathconfName (int value, int* rval);
 int Mono_Posix_FromPollEvents (short value, short* rval);
 int Mono_Posix_FromPosixFadviseAdvice (int value, int* rval);
 int Mono_Posix_FromPosixMadviseAdvice (int value, int* rval);
 int Mono_Posix_FromSeekFlags (short value, short* rval);
 int Mono_Posix_FromSignum (int value, int* rval);
 int Mono_Posix_FromSysConf (int value, int* rval);
+int Mono_Posix_FromSysconfName (int value, int* rval);
 int Mono_Posix_FromSyslogFacility (int value, int* rval);
 int Mono_Posix_FromSyslogLevel (int value, int* rval);
 int Mono_Posix_FromSyslogOptions (int value, int* rval);
@@ -212,6 +215,7 @@ gint64 Mono_Posix_Syscall_write (int fd, void* buf, guint64 count);
 int Mono_Posix_ToAccessMode (int value, int* rval);
 int Mono_Posix_ToAccessModes (int value, int* rval);
 int Mono_Posix_ToConfStr (int value, int* rval);
+int Mono_Posix_ToConfstrName (int value, int* rval);
 int Mono_Posix_ToDirectoryNotifyFlags (int value, int* rval);
 int Mono_Posix_ToErrno (int value, int* rval);
 int Mono_Posix_ToError (int value, int* rval);
@@ -228,12 +232,14 @@ int Mono_Posix_ToMremapFlags (guint64 value, guint64* rval);
 int Mono_Posix_ToMsyncFlags (int value, int* rval);
 int Mono_Posix_ToOpenFlags (int value, int* rval);
 int Mono_Posix_ToPathConf (int value, int* rval);
+int Mono_Posix_ToPathconfName (int value, int* rval);
 int Mono_Posix_ToPollEvents (short value, short* rval);
 int Mono_Posix_ToPosixFadviseAdvice (int value, int* rval);
 int Mono_Posix_ToPosixMadviseAdvice (int value, int* rval);
 int Mono_Posix_ToSeekFlags (short value, short* rval);
 int Mono_Posix_ToSignum (int value, int* rval);
 int Mono_Posix_ToSysConf (int value, int* rval);
+int Mono_Posix_ToSysconfName (int value, int* rval);
 int Mono_Posix_ToSyslogFacility (int value, int* rval);
 int Mono_Posix_ToSyslogLevel (int value, int* rval);
 int Mono_Posix_ToSyslogOptions (int value, int* rval);

+ 0 - 5
support/map.c

@@ -7976,7 +7976,6 @@ int Mono_Posix_FromSyslogFacility (int x, int *r)
 #else /* def LOG_USER */
 		{errno = EINVAL; return -1;}
 #endif /* ndef LOG_USER */
-	/* Mono_Posix_SyslogFacility_LOG_USRE is obsolete; ignoring */
 	if (x == Mono_Posix_SyslogFacility_LOG_UUCP)
 #ifdef LOG_UUCP
 		{*r = LOG_UUCP; return 0;}
@@ -8067,10 +8066,6 @@ int Mono_Posix_ToSyslogFacility (int x, int *r)
 	if (x == LOG_USER)
 		{*r = Mono_Posix_SyslogFacility_LOG_USER; return 0;}
 #endif /* ndef LOG_USER */
-#ifdef LOG_USRE
-	if (x == LOG_USRE)
-		{*r = Mono_Posix_SyslogFacility_LOG_USRE; return 0;}
-#endif /* ndef LOG_USRE */
 #ifdef LOG_UUCP
 	if (x == LOG_UUCP)
 		{*r = Mono_Posix_SyslogFacility_LOG_UUCP; return 0;}

+ 0 - 1
support/map.h

@@ -849,7 +849,6 @@ int Mono_Posix_ToSysconfName (int x, int *r);
 #define Mono_Posix_SyslogFacility_LOG_NEWS 0x00000038
 #define Mono_Posix_SyslogFacility_LOG_SYSLOG 0x00000028
 #define Mono_Posix_SyslogFacility_LOG_USER 0x00000008
-#define Mono_Posix_SyslogFacility_LOG_USRE 0x00000008
 #define Mono_Posix_SyslogFacility_LOG_UUCP 0x00000040
 int Mono_Posix_FromSyslogFacility (int x, int *r);
 int Mono_Posix_ToSyslogFacility (int x, int *r);