2004-04-26 David Waite <[email protected]>

in interpreter
	* interp.h: remove comma from end of enumeration constants
	declarations

in io-layer
	* daemon-messages.h:
	* daemon-private.h
	* error.h:
	* io.h:
	* processes.h:
	* shared.h:
	* thread-private.h:
	* wapi-private.h: remove comma from end of enumeration declarations
	* status.h: cast unsigned int types to int for enum assignment

in metadata
	* file-io.h:
	* socket-io.h:
	* threads.h:
	* unicode.h: remove comma from end of enumeration declarations

in mini
	* driver.c: remove comma from end of enumeration declaration

in utils
	* mono-logger.h: remove comma from end of enumeration declaration

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

mono/interpreter/ChangeLog

@@ -1,3 +1,8 @@
+2004-04-26  David Waite  <[email protected]>
+
+	* interp.h: remove comma from end of enumeration constants
+	declarations
+
 2004-04-21  Bernie Solomon  <[email protected]>
 
 	* interp.h: put in space for old type field

mono/interpreter/interp.h

@@ -13,7 +13,7 @@ enum {
 	VAL_NATI    = 0 + VAL_POINTER,
 	VAL_MP      = 1 + VAL_POINTER,
 	VAL_TP      = 2 + VAL_POINTER,
-	VAL_OBJ     = 3 + VAL_POINTER,
+	VAL_OBJ     = 3 + VAL_POINTER
 };
 
 #if SIZEOF_VOID_P == 4

mono/io-layer/ChangeLog

@@ -1,3 +1,15 @@
+2004-04-26  David Waite  <[email protected]>
+
+	* daemon-messages.h:
+	* daemon-private.h
+	* error.h:
+	* io.h:
+	* processes.h:
+	* shared.h:
+	* thread-private.h:
+	* wapi-private.h: remove comma from end of enumeration declarations
+	* status.h: cast unsigned int types to int for enum assignment
+
 2004-04-26 David Waite <[email protected]>
 
 	* io.c:

mono/io-layer/daemon-messages.h

@@ -20,7 +20,7 @@ typedef enum {
 	WapiHandleRequestType_Scratch,
 	WapiHandleRequestType_ScratchFree,
 	WapiHandleRequestType_ProcessFork,
-	WapiHandleRequestType_ProcessKill,
+	WapiHandleRequestType_ProcessKill
 } WapiHandleRequestType;
 
 typedef struct 
@@ -88,7 +88,7 @@ typedef enum {
 	WapiHandleResponseType_Scratch,
 	WapiHandleResponseType_ScratchFree,
 	WapiHandleResponseType_ProcessFork,
-	WapiHandleResponseType_ProcessKill,
+	WapiHandleResponseType_ProcessKill
 } WapiHandleResponseType;
 
 typedef struct 

mono/io-layer/daemon-private.h

@@ -16,7 +16,7 @@ typedef enum {
 	DAEMON_STARTING = 0,
 	DAEMON_RUNNING  = 1,
 	DAEMON_DIED_AT_STARTUP = 2,
-	DAEMON_CLOSING = 3,
+	DAEMON_CLOSING = 3
 } _wapi_daemon_status;
 
 extern void _wapi_daemon_main (gpointer data, gpointer scratch);

mono/io-layer/error.h

@@ -1792,7 +1792,7 @@ typedef enum {
 	ERROR_SXS_UNTRANSLATABLE_HRESULT = 14077,
 	ERROR_SXS_PROTECTION_CATALOG_FILE_MISSING = 14078,
 	ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE = 14079,
-	ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE_NAME = 14080,
+	ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE_NAME = 14080
 } WapiError;
 
 extern guint32 GetLastError(void);

mono/io-layer/io.h

@@ -85,21 +85,21 @@ typedef void (*WapiOverlappedCB) (guint32 error, guint32 numbytes,
 typedef enum {
 	STD_INPUT_HANDLE=-10,
 	STD_OUTPUT_HANDLE=-11,
-	STD_ERROR_HANDLE=-12,
+	STD_ERROR_HANDLE=-12
 } WapiStdHandle;
 
 typedef enum {
 	FILE_BEGIN=0,
 	FILE_CURRENT=1,
-	FILE_END=2,
+	FILE_END=2
 } WapiSeekMethod;
 
 typedef enum {
 	FILE_TYPE_UNKNOWN=0x0000,
 	FILE_TYPE_DISK=0x0001,
 	FILE_TYPE_CHAR=0x0002,
 	FILE_TYPE_PIPE=0x0003,
-	FILE_TYPE_REMOTE=0x8000,
+	FILE_TYPE_REMOTE=0x8000
 } WapiFileType;
 
 typedef enum {

mono/io-layer/processes.h

@@ -24,7 +24,7 @@ typedef enum {
 	STARTF_RUNFULLSCREEN=0x020,
 	STARTF_FORCEONFEEDBACK=0x040,
 	STARTF_FORCEOFFFEEDBACK=0x080,
-	STARTF_USESTDHANDLES=0x100,
+	STARTF_USESTDHANDLES=0x100
 } WapiStartupFlags;
 
 

mono/io-layer/shared.h

@@ -20,7 +20,7 @@ struct _WapiScratchHeader
 };
 
 enum {
-	WAPI_SHM_SCRATCH_FREE=0x1,
+	WAPI_SHM_SCRATCH_FREE=0x1
 };
 
 typedef enum {

mono/io-layer/status.h

@@ -11,35 +11,35 @@
 #define _WAPI_STATUS_H_
 
 typedef enum {
-	STATUS_WAIT_0 			= 0x00000000,
-	STATUS_ABANDONED_WAIT_0 	= 0x00000080,
-	STATUS_USER_APC			= 0x000000C0,
-	STATUS_TIMEOUT			= 0x00000102,
-	STATUS_PENDING			= 0x00000103,
-	STATUS_SEGMENT_NOTIFICATION	= 0x40000005,
-	STATUS_GUARD_PAGE_VIOLATION	= 0x80000001,
-	STATUS_DATATYPE_MISALIGNMENT	= 0x80000002,
-	STATUS_BREAKPOINT		= 0x80000003,
-	STATUS_SINGLE_STEP		= 0x80000004,
-	STATUS_ACCESS_VIOLATION		= 0xC0000005,
-	STATUS_IN_PAGE_ERROR		= 0xC0000006,
-	STATUS_NO_MEMORY		= 0xC0000017,
-	STATUS_ILLEGAL_INSTRUCTION	= 0xC000001D,
-	STATUS_NONCONTINUABLE_EXCEPTION	= 0xC0000025,
-	STATUS_INVALID_DISPOSITION	= 0xC0000026,
-	STATUS_ARRAY_BOUNDS_EXCEEDED	= 0xC000008C,
-	STATUS_FLOAT_DENORMAL_OPERAND	= 0xC000008D,
-	STATUS_FLOAT_DIVIDE_BY_ZERO	= 0xC000008E,
-	STATUS_FLOAT_INEXACT_RESULT	= 0xC000008F,
-	STATUS_FLOAT_INVALID_OPERATION	= 0xC0000090,
-	STATUS_FLOAT_OVERFLOW		= 0xC0000091,
-	STATUS_FLOAT_STACK_CHECK	= 0xC0000092,
-	STATUS_FLOAT_UNDERFLOW		= 0xC0000093,
-	STATUS_INTEGER_DIVIDE_BY_ZERO	= 0xC0000094,
-	STATUS_INTEGER_UNDERFLOW	= 0xC0000095,
-	STATUS_PRIVILEGED_INSTRUCTION	= 0xC0000096,
-	STATUS_STACK_OVERFLOW		= 0xC00000FD,
-	STATUS_CONTROL_C_EXIT		= 0xC000013A,
+	STATUS_WAIT_0 			= (int) 0x00000000,
+	STATUS_ABANDONED_WAIT_0 	= (int) 0x00000080,
+	STATUS_USER_APC			= (int) 0x000000C0,
+	STATUS_TIMEOUT			= (int) 0x00000102,
+	STATUS_PENDING			= (int) 0x00000103,
+	STATUS_SEGMENT_NOTIFICATION	= (int) 0x40000005,
+	STATUS_GUARD_PAGE_VIOLATION	= (int) 0x80000001,
+	STATUS_DATATYPE_MISALIGNMENT	= (int) 0x80000002,
+	STATUS_BREAKPOINT		= (int) 0x80000003,
+	STATUS_SINGLE_STEP		= (int) 0x80000004,
+	STATUS_ACCESS_VIOLATION		= (int) 0xC0000005,
+	STATUS_IN_PAGE_ERROR		= (int) 0xC0000006,
+	STATUS_NO_MEMORY		= (int) 0xC0000017,
+	STATUS_ILLEGAL_INSTRUCTION	= (int) 0xC000001D,
+	STATUS_NONCONTINUABLE_EXCEPTION	= (int) 0xC0000025,
+	STATUS_INVALID_DISPOSITION	= (int) 0xC0000026,
+	STATUS_ARRAY_BOUNDS_EXCEEDED	= (int) 0xC000008C,
+	STATUS_FLOAT_DENORMAL_OPERAND	= (int) 0xC000008D,
+	STATUS_FLOAT_DIVIDE_BY_ZERO	= (int) 0xC000008E,
+	STATUS_FLOAT_INEXACT_RESULT	= (int) 0xC000008F,
+	STATUS_FLOAT_INVALID_OPERATION	= (int) 0xC0000090,
+	STATUS_FLOAT_OVERFLOW		= (int) 0xC0000091,
+	STATUS_FLOAT_STACK_CHECK	= (int) 0xC0000092,
+	STATUS_FLOAT_UNDERFLOW		= (int) 0xC0000093,
+	STATUS_INTEGER_DIVIDE_BY_ZERO	= (int) 0xC0000094,
+	STATUS_INTEGER_UNDERFLOW	= (int) 0xC0000095,
+	STATUS_PRIVILEGED_INSTRUCTION	= (int) 0xC0000096,
+	STATUS_STACK_OVERFLOW		= (int) 0xC00000FD,
+	STATUS_CONTROL_C_EXIT		= (int) 0xC000013A
 } WapiStatus;
 
 #endif /* _WAPI_STATUS_H_ */

mono/io-layer/thread-private.h

@@ -19,7 +19,7 @@ extern struct _WapiHandleOps _wapi_thread_ops;
 
 typedef enum {
 	THREAD_STATE_START,
-	THREAD_STATE_EXITED,
+	THREAD_STATE_EXITED
 } WapiThreadState;
 
 struct _WapiHandle_thread

mono/io-layer/wapi-private.h

@@ -49,7 +49,7 @@ typedef enum {
 	WAPI_HANDLE_FIND,
 	WAPI_HANDLE_PROCESS,
 	WAPI_HANDLE_PIPE,
-	WAPI_HANDLE_COUNT,
+	WAPI_HANDLE_COUNT
 } WapiHandleType;
 
 #define _WAPI_SHARED_NAMESPACE(type) (type==WAPI_HANDLE_MUTEX)
@@ -62,7 +62,7 @@ typedef struct
 typedef enum {
 	WAPI_HANDLE_CAP_WAIT=0x01,
 	WAPI_HANDLE_CAP_SIGNAL=0x02,
-	WAPI_HANDLE_CAP_OWN=0x04,
+	WAPI_HANDLE_CAP_OWN=0x04
 } WapiHandleCapability;
 
 struct _WapiHandleOps 

mono/metadata/ChangeLog

@@ -1,3 +1,10 @@
+2004-04-26 David Waite <[email protected]>
+
+	* file-io.h:
+	* socket-io.h:
+	* threads.h:
+	* unicode.h: remove comma from end of enumeration declarations
+
 2004-04-26 David Waite <[email protected]>
 
 	* debug-mono-symfile.h:

mono/metadata/file-io.h

@@ -21,7 +21,7 @@
 typedef enum {
 	FileAccess_Read=0x01,
 	FileAccess_Write=0x02,
-	FileAccess_ReadWrite=FileAccess_Read|FileAccess_Write,
+	FileAccess_ReadWrite=FileAccess_Read|FileAccess_Write
 } MonoFileAccess;
 
 /* This is a copy of System.IO.FileMode */
@@ -31,22 +31,22 @@ typedef enum {
 	FileMode_Open=3,
 	FileMode_OpenOrCreate=4,
 	FileMode_Truncate=5,
-	FileMode_Append=6,
+	FileMode_Append=6
 } MonoFileMode;
 
 /* This is a copy of System.IO.FileShare */
 typedef enum {
 	FileShare_None=0x0,
 	FileShare_Read=0x01,
 	FileShare_Write=0x02,
-	FileShare_ReadWrite=FileShare_Read|FileShare_Write,
+	FileShare_ReadWrite=FileShare_Read|FileShare_Write
 } MonoFileShare;
 
 /* This is a copy of System.IO.SeekOrigin */
 typedef enum {
 	SeekOrigin_Begin=0,
 	SeekOrigin_Current=1,
-	SeekOrigin_End=2,
+	SeekOrigin_End=2
 } MonoSeekOrigin;
 
 /* This is a copy of System.IO.MonoIOStat */
@@ -75,7 +75,7 @@ typedef enum {
 	FileAttributes_Offline=0x01000,
 	FileAttributes_NotContentIndexed=0x02000,
 	FileAttributes_Encrypted=0x04000,
-	FileAttributes_MonoExecutable=0x80000000,
+	FileAttributes_MonoExecutable= (int) 0x80000000
 } MonoFileAttributes;
 
 typedef struct _MonoFSAsyncResult {

mono/metadata/socket-io.h

@@ -23,7 +23,7 @@ typedef enum {
 	SocketType_Raw=3,
 	SocketType_Rdm=4,
 	SocketType_Seqpacket=5,
-	SocketType_Unknown=-1,
+	SocketType_Unknown=-1
 } MonoSocketType;
 
 /* This is a copy of System.Net.Sockets.AddressFamily */
@@ -57,7 +57,7 @@ typedef enum {
 	AddressFamily_Cluster=24,
 	AddressFamily_Ieee12844=25,
 	AddressFamily_Irda=26,
-	AddressFamily_NetworkDesigners=28,
+	AddressFamily_NetworkDesigners=28
 } MonoAddressFamily;
 
 /* This is a copy of System.Net.Sockets.ProtocolType */
@@ -77,7 +77,7 @@ typedef enum {
 	ProtocolType_Ipx=1000,
 	ProtocolType_Spx=1256,
 	ProtocolType_SpxII=1257,
-	ProtocolType_Unknown=-1,
+	ProtocolType_Unknown=-1
 } MonoProtocolType;
 
 /* This is a copy of System.Net.Sockets.SocketOptionLevel */
@@ -86,7 +86,7 @@ typedef enum {
 	SocketOptionLevel_IP=0,
 	SocketOptionLevel_IPv6=41,
 	SocketOptionLevel_Tcp=6,
-	SocketOptionLevel_Udp=17,
+	SocketOptionLevel_Udp=17
 } MonoSocketOptionLevel;
 
 /* This is a copy of System.Net.Sockets.SocketOptionName */
@@ -130,7 +130,7 @@ typedef enum {
 	SocketOptionName_BsdUrgent=2,
 	SocketOptionName_Expedited=2,
 	SocketOptionName_NoChecksum=1,
-	SocketOptionName_ChecksumCoverage=20,
+	SocketOptionName_ChecksumCoverage=20
 } MonoSocketOptionName;
 
 extern gpointer ves_icall_System_Net_Sockets_Socket_Socket_internal(MonoObject *this, gint32 family, gint32 type, gint32 proto, gint32 *error);

mono/metadata/threads.h

@@ -25,7 +25,7 @@ typedef enum {
 	ThreadState_WaitSleepJoin = 0x00000020,
 	ThreadState_Suspended = 0x00000040,
 	ThreadState_AbortRequested = 0x00000080,
-	ThreadState_Aborted = 0x00000100,
+	ThreadState_Aborted = 0x00000100
 } MonoThreadState;
 
 #define SPECIAL_STATIC_NONE 0

mono/metadata/unicode.h

@@ -45,7 +45,7 @@ typedef enum {
 	CurrencySymbol          = 26,
 	ModifierSymbol          = 27,
 	OtherSymbol             = 28,
-	OtherNotAssigned        = 29,
+	OtherNotAssigned        = 29
 } MonoUnicodeCategory;
 
 #endif

mono/mini/ChangeLog

@@ -1,3 +1,7 @@
+2004-04-26  David Waite  <[email protected]>
+
+	* driver.c: remove comma from end of enumeration declaration
+
 2004-04-26  Jackson Harper  <[email protected]>
 
 	* driver.c: parse config file before loading first assembly. This

mono/mini/driver.c

@@ -387,7 +387,7 @@ enum {
 	DO_REGRESSION,
 	DO_COMPILE,
 	DO_EXEC,
-	DO_DRAW,
+	DO_DRAW
 };
 
 typedef struct CompileAllThreadArgs {

mono/utils/ChangeLog

@@ -1,3 +1,6 @@
+2004-04-26  David Waite  <[email protected]>
+
+	* mono-logger.h: remove comma from end of enumeration declaration
 
 Fri Apr 23 11:04:33 EDT 2004 Paolo Molaro <[email protected]>
 

mono/utils/mono-logger.h

@@ -12,7 +12,7 @@ typedef enum {
 	MONO_TRACE_ALL			=   MONO_TRACE_ASSEMBLY |
 								MONO_TRACE_TYPE |
 								MONO_TRACE_DLLIMPORT |
-								MONO_TRACE_GC,
+								MONO_TRACE_GC
 } MonoTraceMask;
 
 void