Get rid of gcc __inline__ keywords.

Just let the compiler sort it out.
This commit is contained in:
Cas Cremers 2019-01-04 13:34:56 +01:00
parent 0f8f1054b6
commit d56c2cafe6
8 changed files with 17 additions and 17 deletions

View File

@ -95,7 +95,7 @@ indact ()
* Roledef based. * Roledef based.
*@returns MATCH_NONE or MATCH_CONTENT *@returns MATCH_NONE or MATCH_CONTENT
*/ */
__inline__ int int
events_match_rd (const Roledef rdi, const Roledef rdj) events_match_rd (const Roledef rdi, const Roledef rdj)
{ {
if (isTermEqual (rdi->message, rdj->message) && if (isTermEqual (rdi->message, rdj->message) &&
@ -117,7 +117,7 @@ events_match_rd (const Roledef rdi, const Roledef rdj)
/** /**
*@returns any of the MATCH_ signals *@returns any of the MATCH_ signals
*/ */
__inline__ int int
events_match (const System sys, const int i, const int j) events_match (const System sys, const int i, const int j)
{ {
Roledef rdi, rdj; Roledef rdi, rdj;
@ -150,7 +150,7 @@ events_match (const System sys, const int i, const int j)
//! Check nisynch from label_to_index. //! Check nisynch from label_to_index.
__inline__ int int
oki_nisynch_full (const System sys, const Termmap label_to_index) oki_nisynch_full (const System sys, const Termmap label_to_index)
{ {
// Are all labels well linked? // Are all labels well linked?
@ -177,7 +177,7 @@ oki_nisynch_full (const System sys, const Termmap label_to_index)
} }
//! Evaluate claims or internal recvs (chooses) //! Evaluate claims or internal recvs (chooses)
__inline__ int int
oki_nisynch_other (const System sys, const int trace_index, oki_nisynch_other (const System sys, const int trace_index,
const Termmap role_to_run, const Termmap label_to_index) const Termmap role_to_run, const Termmap label_to_index)
{ {
@ -198,7 +198,7 @@ oki_nisynch_other (const System sys, const int trace_index,
} }
//! Evaluate recvs //! Evaluate recvs
__inline__ int int
oki_nisynch_recv (const System sys, const int trace_index, oki_nisynch_recv (const System sys, const int trace_index,
const Termmap role_to_run, const Termmap label_to_index) const Termmap role_to_run, const Termmap label_to_index)
{ {
@ -261,7 +261,7 @@ oki_nisynch_recv (const System sys, const int trace_index,
//! Evaluate sends //! Evaluate sends
__inline__ int int
oki_nisynch_send (const System sys, const int trace_index, oki_nisynch_send (const System sys, const int trace_index,
const Termmap role_to_run, const Termmap label_to_index) const Termmap role_to_run, const Termmap label_to_index)
{ {

View File

@ -93,7 +93,7 @@ preferSubstitutionOrder (Term ta, Term tb)
} }
//! See if a substitution is valid //! See if a substitution is valid
__inline__ int int
goodsubst (Term tvar, Term tsubst) goodsubst (Term tvar, Term tsubst)
{ {
Term tbuf; Term tbuf;

View File

@ -25,7 +25,7 @@
* Note that these are also used for encountered claims and such. * Note that these are also used for encountered claims and such.
*/ */
__inline__ states_t states_t
statesIncrease (const states_t states) statesIncrease (const states_t states)
{ {
return states + 1; return states + 1;
@ -35,7 +35,7 @@ statesIncrease (const states_t states)
/** /**
* Acts like a modified form of %g * Acts like a modified form of %g
*/ */
__inline__ void void
statesFormat (const states_t states) statesFormat (const states_t states)
{ {
eprintf ("%lu", states); eprintf ("%lu", states);

View File

@ -31,7 +31,7 @@
typedef unsigned long int states_t; typedef unsigned long int states_t;
#define STATES0 0 #define STATES0 0
__inline__ states_t statesIncrease (const states_t states); states_t statesIncrease (const states_t states);
__inline__ void statesFormat (const states_t states); void statesFormat (const states_t states);
#endif #endif

View File

@ -193,7 +193,7 @@ makeTermType (const int type, const Symbol symb, const int runid)
*@return A term that is either not a variable, or has a NULL substitution. *@return A term that is either not a variable, or has a NULL substitution.
*\sa deVar() *\sa deVar()
*/ */
__inline__ Term Term
deVarScan (Term t) deVarScan (Term t)
{ {
while (realTermVariable (t) && t->subst != NULL) while (realTermVariable (t) && t->subst != NULL)

View File

@ -103,7 +103,7 @@ Term makeTermEncrypt (Term t1, Term t2);
Term makeTermFcall (Term t1, Term t2); Term makeTermFcall (Term t1, Term t2);
Term makeTermTuple (Term t1, Term t2); Term makeTermTuple (Term t1, Term t2);
Term makeTermType (const int type, const Symbol symb, const int runid); Term makeTermType (const int type, const Symbol symb, const int runid);
__inline__ Term deVarScan (Term t); Term deVarScan (Term t);
#define realTermLeaf(t) (t != NULL && t->type <= LEAF) #define realTermLeaf(t) (t != NULL && t->type <= LEAF)
#define realTermTuple(t) (t != NULL && t->type == TUPLE) #define realTermTuple(t) (t != NULL && t->type == TUPLE)
#define realTermEncrypt(t) (t != NULL && t->type == ENCRYPT) #define realTermEncrypt(t) (t != NULL && t->type == ENCRYPT)

View File

@ -159,7 +159,7 @@ termlistDestroy (Termlist tl)
* *
*@return True iff the term is an element of the termlist. *@return True iff the term is an element of the termlist.
*/ */
__inline__ int int
inTermlist (Termlist tl, const Term term) inTermlist (Termlist tl, const Term term)
{ {
if (term == NULL) if (term == NULL)
@ -178,7 +178,7 @@ inTermlist (Termlist tl, const Term term)
} }
//! Determine whether a term is an element of a termlist: yield pointer //! Determine whether a term is an element of a termlist: yield pointer
__inline__ Termlist Termlist
termlistFind (Termlist tl, const Term term) termlistFind (Termlist tl, const Term term)
{ {
#ifdef DEBUG #ifdef DEBUG

View File

@ -47,8 +47,8 @@ Termlist termlistShallow (Termlist tl);
void termlistDelete (Termlist tl); void termlistDelete (Termlist tl);
void termlistDestroy (Termlist tl); void termlistDestroy (Termlist tl);
void termlistPrint (Termlist tl); void termlistPrint (Termlist tl);
__inline__ int inTermlist (Termlist tl, const Term term); int inTermlist (Termlist tl, const Term term);
__inline__ Termlist termlistFind (Termlist tl, const Term term); Termlist termlistFind (Termlist tl, const Term term);
int isTermlistEqual (Termlist tl1, Termlist tl2); int isTermlistEqual (Termlist tl1, Termlist tl2);
Termlist termlistAdd (Termlist tl, Term term); Termlist termlistAdd (Termlist tl, Term term);
#define termlistPrepend(tl,t) termlistAdd(tl,t) #define termlistPrepend(tl,t) termlistAdd(tl,t)