Fixed warning in MSVC: 'different types for formal and actual parameter'.

[mono.git] / mono / metadata / cil-coff.h

diff --git a/mono/metadata/cil-coff.h b/mono/metadata/cil-coff.h
index c85b97a627744f923a32bf14f697dcda5e087082..26b4782ca5a101ac942172f0dbd61fb5a857493c 100644 (file)
--- a/mono/metadata/cil-coff.h
+++ b/mono/metadata/cil-coff.h
@@ -3,13 +3,13 @@
 #define __MONO_CIL_COFF_H__
 
 #include <mono/metadata/metadata.h>
+#include <glib.h>
 
 /*
  * 25.2.1: Method header type values
  */
-#define METHOD_HEADER_FORMAT_MASK   7
+#define METHOD_HEADER_FORMAT_MASK   3
 #define METHOD_HEADER_TINY_FORMAT   2
-#define METHOD_HEADER_TINY_FORMAT1  6
 #define METHOD_HEADER_FAT_FORMAT    3
 
 /*
@@ -37,6 +37,12 @@ typedef struct {
        char    msdos_header2 [64];
 } MonoMSDOSHeader;
 
+/* Possible values for coff_machine */
+#define COFF_MACHINE_I386 332
+#define COFF_MACHINE_IA64 512
+#define COFF_MACHINE_AMD64 34404
+#define COFF_MACHINE_ARM 452
+
 /* 20 bytes */
 typedef struct {
        guint16  coff_machine;
@@ -153,6 +159,7 @@ typedef struct {
 #define MONO_PE_RESOURCE_ID_ANICURSOR  0x15
 #define MONO_PE_RESOURCE_ID_ANIICON    0x16
 #define MONO_PE_RESOURCE_ID_HTML       0x17
+#define MONO_PE_RESOURCE_ID_ASPNET_STRING      0x65
 
 typedef struct {
        /* If the MSB is set, then the other 31 bits store the RVA of
@@ -288,6 +295,7 @@ typedef struct {
 #define CLI_FLAGS_ILONLY         0x01
 #define CLI_FLAGS_32BITREQUIRED  0x02
 #define CLI_FLAGS_STRONGNAMESIGNED 0x8
+#define CLI_FLAGS_PREFERRED32BIT  0x10
 #define CLI_FLAGS_TRACKDEBUGDATA 0x00010000
        guint32        ch_flags;
 
@@ -319,6 +327,6 @@ typedef struct {
        MonoCLIHeader     cli_cli_header;
 } MonoCLIImageInfo;
 
-guint32       mono_cli_rva_image_map (MonoImage *image, guint32 rva);
+MONO_API guint32       mono_cli_rva_image_map (MonoImage *image, guint32 rva);
 
 #endif /* __MONO_CIL_COFF_H__ */