Improved exception function declarations for MSVC

mmottl · mmottl · commit ddc5c17fce32 · 2017-10-08T23:19:41.000-04:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,8 @@
+### ?.?.? (????-??-??)
+
+  * Improved compatibility with MSVC
+
+
 ### 4.2.0 (2017-08-03)
 
   * Switched to jbuilder and topkg
diff --git a/src/sqlite3_stubs.c b/src/sqlite3_stubs.c
@@ -170,7 +170,9 @@ static inline void raise_with_two_args(value v_tag, value v_arg1, value v_arg2)
   CAMLnoreturn;
 }
 
-static inline void raise_sqlite3_InternalError(char *msg) Noreturn;
+CAMLnoreturn_start
+static inline void raise_sqlite3_InternalError(char *msg)
+CAMLnoreturn_end;
 
 static inline void raise_sqlite3_InternalError(char *msg)
 {
@@ -183,7 +185,9 @@ static inline void range_check(int v, int max)
     raise_with_two_args(*caml_sqlite3_RangeError, Val_int(v), Val_int(max));
 }
 
-static void raise_sqlite3_Error(const char *fmt, ...) Noreturn;
+CAMLnoreturn_start
+static void raise_sqlite3_Error(const char *fmt, ...)
+CAMLnoreturn_end;
 
 static void raise_sqlite3_Error(const char *fmt, ...)
 {

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,9 @@ static inline void raise_with_two_args(value v_tag, value v_arg1, value v_arg2)`
`170`	`170`	`CAMLnoreturn;`
`171`	`171`	`}`
`172`	`172`
`173`		`-static inline void raise_sqlite3_InternalError(char *msg) Noreturn;`
	`173`	`+CAMLnoreturn_start`
	`174`	`+static inline void raise_sqlite3_InternalError(char *msg)`
	`175`	`+CAMLnoreturn_end;`
`174`	`176`
`175`	`177`	`static inline void raise_sqlite3_InternalError(char *msg)`
`176`	`178`	`{`
`@@ -183,7 +185,9 @@ static inline void range_check(int v, int max)`
`183`	`185`	`raise_with_two_args(*caml_sqlite3_RangeError, Val_int(v), Val_int(max));`
`184`	`186`	`}`
`185`	`187`
`186`		`-static void raise_sqlite3_Error(const char *fmt, ...) Noreturn;`
	`188`	`+CAMLnoreturn_start`
	`189`	`+static void raise_sqlite3_Error(const char *fmt, ...)`
	`190`	`+CAMLnoreturn_end;`
`187`	`191`
`188`	`192`	`static void raise_sqlite3_Error(const char *fmt, ...)`
`189`	`193`	`{`