combine multiple definitions of LISTempty

Nicholas Reed · Nicholas Reed · commit c073fbecb957 · 2012-07-11T22:57:25.000Z
diff --git a/include/express/linklist.h b/include/express/linklist.h
@@ -145,5 +145,6 @@ extern SCL_EXPRESS_EXPORT Generic  LISTget_second PROTO( ( Linked_List ) );
 extern SCL_EXPRESS_EXPORT Generic  LISTget_nth PROTO( ( Linked_List, int ) );
 extern SCL_EXPRESS_EXPORT void LISTfree PROTO( ( Linked_List ) );
 extern SCL_EXPRESS_EXPORT int  LISTget_length PROTO( ( Linked_List ) );
+extern SCL_EXPRESS_EXPORT bool LISTempty( Linked_List list );
 
 #endif /*LINKED_LIST_H*/
diff --git a/src/express/linklist.c b/src/express/linklist.c
@@ -229,3 +229,14 @@ LISTget_length( Linked_List list ) {
     }
     return count;
 }
+
+
+bool LISTempty( Linked_List list ) {
+    if( !list ) {
+        return true;
+    }
+    if( list->mark->next == list->mark ) {
+        return true;
+    }
+    return false;
+}
diff --git a/src/fedex_plus/classes.c b/src/fedex_plus/classes.c
@@ -34,16 +34,6 @@ int isAggregateType( const Type t );
 int isAggregate( Variable a );
 Variable VARis_type_shifter( Variable a );
 
-static_inline bool LISTempty( Linked_List list ) {
-    if( !list ) {
-        return true;
-    }
-    if( list->mark->next == list->mark ) {
-        return true;
-    }
-    return false;
-}
-
 int multiple_inheritance = 1;
 int print_logging = 0;
 int old_accessors = 0;
diff --git a/src/fedex_plus/classes_misc.c b/src/fedex_plus/classes_misc.c
@@ -24,18 +24,6 @@ extern char * scl_version();
 extern int multiple_inheritance;
 /*extern int corba_binding; */
 
-static_inline
-bool
-LISTempty( Linked_List list ) {
-    if( !list ) {
-        return true;
-    }
-    if( list->mark->next == list->mark ) {
-        return true;
-    }
-    return false;
-}
-
 /******************************************************************
 **      The following functions will be used        ***
 ***     through out the the program fedex_plus      ***/
