drop static_inline macro

cshorler · cshorler · commit e9c28ff7cbad · 2019-08-07T20:30:32.000+01:00
diff --git a/include/express/basic.h b/include/express/basic.h
@@ -85,6 +85,9 @@
 # include <sc_stdbool.h>
 #endif
 
+#if defined(_MSC_VER) && (_MSC_VER < 1900) && !defined(__cplusplus)
+#define inline __inline
+#endif
 
 /**************************/
 /* function pointer types */
@@ -93,20 +96,6 @@
 typedef void ( *voidFuncptr )();
 typedef int ( *intFuncptr )();
 
-/******************************/
-/* deal with inline functions */
-/******************************/
-
-#if !defined(static_inline)
-#if (!defined(__GNUC__) && !defined(__MSVC__)) || defined(__STRICT_ANSI)
-#define static_inline
-#undef supports_inline_functions
-#else
-#define static_inline static __inline
-#define supports_inline_functions   1L
-#endif    /*    */
-#endif /* !defined(static_inline) */
-
 /* allow same declarations to suffice for both Standard and Classic C */
 /* ... at least in header files ... */
 
diff --git a/include/express/error.h b/include/express/error.h
@@ -126,23 +126,23 @@ extern SC_EXPRESS_EXPORT void ERROR_flush_message_buffer( void );
 /* Inline functions */
 /********************/
 
-static_inline void ERRORdisable( Error error ) {
+static inline void ERRORdisable( Error error ) {
     if( error != ERROR_none ) {
         error->enabled = false;
     }
 }
 
-static_inline void ERRORenable( Error error ) {
+static inline void ERRORenable( Error error ) {
     if( error != ERROR_none ) {
         error->enabled = true;
     }
 }
 
-static_inline bool ERRORis_enabled( Error error ) {
+static inline bool ERRORis_enabled( Error error ) {
     return error->enabled;
 }
 
-static_inline void ERRORbuffer_messages( bool flag ) {
+static inline void ERRORbuffer_messages( bool flag ) {
 #if !defined(__MSVC__) && !defined(__BORLAND__)
     extern void ERROR_start_message_buffer( void ),
            ERROR_flush_message_buffer( void );
@@ -155,7 +155,7 @@ static_inline void ERRORbuffer_messages( bool flag ) {
     }
 }
 
-static_inline void ERRORflush_messages( void ) {
+static inline void ERRORflush_messages( void ) {
 #if !defined(__MSVC__) && !defined(__BORLAND__)
     extern void ERROR_start_message_buffer( void ),
            ERROR_flush_message_buffer( void );
@@ -167,6 +167,7 @@ static_inline void ERRORflush_messages( void ) {
     }
 }
 
+
 /***********************/
 /* function prototypes */
 /***********************/
diff --git a/include/express/lexact.h b/include/express/lexact.h
@@ -95,6 +95,10 @@ extern SC_EXPRESS_EXPORT Error        ERROR_nonascii_char;
 # define SCANtext_ready (*SCANcurrent != '\0')
 #endif
 
+#ifndef static_inline
+# define static_inline static inline
+#endif
+
 /***********************/
 /* function prototypes */
 /***********************/
diff --git a/src/express/expr.c b/src/express/expr.c
@@ -106,7 +106,7 @@ static Error ERROR_enum_no_such_item;
 static Error ERROR_group_ref_no_such_entity;
 static Error ERROR_group_ref_unexpected_type;
 
-static_inline int OPget_number_of_operands( Op_Code op ) {
+static inline int OPget_number_of_operands( Op_Code op ) {
     if( ( op == OP_NEGATE ) || ( op == OP_NOT ) ) {
         return 1;
     } else if( op == OP_SUBCOMPONENT ) {
diff --git a/src/express/hash.c b/src/express/hash.c
@@ -118,7 +118,7 @@ struct freelist_head HASH_Element_fl;
 ** Internal routines
 */
 
-static_inline Address   HASHhash( char *, Hash_Table );
+static inline Address   HASHhash( char *, Hash_Table );
 static void     HASHexpand_table( Hash_Table );
 
 /*
@@ -409,7 +409,7 @@ HASHsearch( Hash_Table table, Element item, Action action ) {
 ** Internal routines
 */
 
-static_inline Address HASHhash( char * Key, Hash_Table table ) {
+static inline Address HASHhash( char * Key, Hash_Table table ) {
     Address     h, address;
     register unsigned char * k = ( unsigned char * )Key;
 

Original file line number	Diff line number	Diff line change
`@@ -126,23 +126,23 @@ extern SC_EXPRESS_EXPORT void ERROR_flush_message_buffer( void );`
`126`	`126`	`/* Inline functions */`
`127`	`127`	`/********************/`
`128`	`128`
`129`		`-static_inline void ERRORdisable( Error error ) {`
	`129`	`+static inline void ERRORdisable( Error error ) {`
`130`	`130`	`if( error != ERROR_none ) {`
`131`	`131`	`error->enabled = false;`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`
`135`		`-static_inline void ERRORenable( Error error ) {`
	`135`	`+static inline void ERRORenable( Error error ) {`
`136`	`136`	`if( error != ERROR_none ) {`
`137`	`137`	`error->enabled = true;`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`
`141`		`-static_inline bool ERRORis_enabled( Error error ) {`
	`141`	`+static inline bool ERRORis_enabled( Error error ) {`
`142`	`142`	`return error->enabled;`
`143`	`143`	`}`
`144`	`144`
`145`		`-static_inline void ERRORbuffer_messages( bool flag ) {`
	`145`	`+static inline void ERRORbuffer_messages( bool flag ) {`
`146`	`146`	`#if !defined(__MSVC__) && !defined(__BORLAND__)`
`147`	`147`	`extern void ERROR_start_message_buffer( void ),`
`148`	`148`	`ERROR_flush_message_buffer( void );`
`@@ -155,7 +155,7 @@ static_inline void ERRORbuffer_messages( bool flag ) {`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`
`158`		`-static_inline void ERRORflush_messages( void ) {`
	`158`	`+static inline void ERRORflush_messages( void ) {`
`159`	`159`	`#if !defined(__MSVC__) && !defined(__BORLAND__)`
`160`	`160`	`extern void ERROR_start_message_buffer( void ),`
`161`	`161`	`ERROR_flush_message_buffer( void );`
`@@ -167,6 +167,7 @@ static_inline void ERRORflush_messages( void ) {`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`
	`170`	`+`
`170`	`171`	`/***********************/`
`171`	`172`	`/* function prototypes */`
`172`	`173`	`/***********************/`