* archive.c: s/__inline__/inline

        * sendmsg.c: Likewise.

        * encoding.c: Remove FIXME about the warning
        about unused variable.
        * sendmsg: Add a FIXME comment saying that
        this should be using libffi.


git-svn-id: https://gcc.gnu.org/svn/gcc/branches/libobjc-branch@76578 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 38 insertions, 30 deletions

diff --git a/libobjc/ChangeLog.branch b/libobjc/ChangeLog.branch
index c427877c68b..4096331e81d 100644
--- a/libobjc/ChangeLog.branch
+++ b/libobjc/ChangeLog.branch
@@ -1,3 +1,11 @@
 2004-01-25  Andrew Pinski  <pinskia@physics.uc.edu>
 
+	* archive.c: s/__inline__/inline
+	* sendmsg.c: Likewise. 
+
+	* encoding.c: Remove FIXME about the warning
+	about unused variable.
+	* sendmsg: Add a FIXME comment saying that
+	this should be using libffi.
+
 	* Makefile.in (LIBTOOL): Use @LIBTOOL@ now as it works.
diff --git a/libobjc/archive.c b/libobjc/archive.c
index aca648ec669..8f0098bb4f8 100644
--- a/libobjc/archive.c
+++ b/libobjc/archive.c
@@ -62,7 +62,7 @@ const char *objc_skip_type (const char *type);
 static void __objc_finish_write_root_object (struct objc_typed_stream *);
 static void __objc_finish_read_root_object (struct objc_typed_stream *);
 
-static __inline__ int
+static inline int
 __objc_code_unsigned_char (unsigned char *buf, unsigned char val)
 {
   if ((val&_B_VALUE) == val)
@@ -87,7 +87,7 @@ objc_write_unsigned_char (struct objc_typed_stream *stream,
   return (*stream->write) (stream->physical, buf, len);
 }
 
-static __inline__ int
+static inline int
 __objc_code_char (unsigned char *buf, signed char val)
 {
   if (val >= 0)
@@ -108,7 +108,7 @@ objc_write_char (struct objc_typed_stream *stream, signed char value)
   return (*stream->write) (stream->physical, buf, len);
 }
 
-static __inline__ int
+static inline int
 __objc_code_unsigned_short (unsigned char *buf, unsigned short val)
 {
   if ((val&_B_VALUE) == val)
@@ -146,7 +146,7 @@ objc_write_unsigned_short (struct objc_typed_stream *stream,
   return (*stream->write) (stream->physical, buf, len);
 }
       
-static __inline__ int
+static inline int
 __objc_code_short (unsigned char *buf, short val)
 {
   int sign = (val < 0);
@@ -165,7 +165,7 @@ objc_write_short (struct objc_typed_stream *stream, short value)
 }
       
 
-static __inline__ int
+static inline int
 __objc_code_unsigned_int (unsigned char *buf, unsigned int val)
 {
   if ((val&_B_VALUE) == val)
@@ -202,7 +202,7 @@ objc_write_unsigned_int (struct objc_typed_stream *stream, unsigned int value)
   return (*stream->write) (stream->physical, buf, len);
 }
 
-static __inline__ int
+static inline int
 __objc_code_int (unsigned char *buf, int val)
 {
   int sign = (val < 0);
@@ -220,7 +220,7 @@ objc_write_int (struct objc_typed_stream *stream, int value)
   return (*stream->write) (stream->physical, buf, len);
 }
 
-static __inline__ int
+static inline int
 __objc_code_unsigned_long (unsigned char *buf, unsigned long val)
 {
   if ((val&_B_VALUE) == val)
@@ -258,7 +258,7 @@ objc_write_unsigned_long (struct objc_typed_stream *stream,
   return (*stream->write) (stream->physical, buf, len);
 }
 
-static __inline__ int
+static inline int
 __objc_code_long (unsigned char *buf, long val)
 {
   int sign = (val < 0);
@@ -350,7 +350,7 @@ objc_write_use_common (struct objc_typed_stream *stream, unsigned long key)
     }
 }
 
-static __inline__ int
+static inline int
 __objc_write_extension (struct objc_typed_stream *stream, unsigned char code)
 {
   if (code <= _B_VALUE)
@@ -366,7 +366,7 @@ __objc_write_extension (struct objc_typed_stream *stream, unsigned char code)
     }
 }
 
-__inline__ int
+inline int
 __objc_write_object (struct objc_typed_stream *stream, id object)
 {
   unsigned char buf = '\0';
@@ -431,7 +431,7 @@ objc_write_object (struct objc_typed_stream *stream, id object)
     }
 }
 
-__inline__ int
+inline int
 __objc_write_class (struct objc_typed_stream *stream, struct objc_class *class)
 {
   __objc_write_extension (stream, _BX_CLASS);
@@ -459,7 +459,7 @@ objc_write_class (struct objc_typed_stream *stream,
 }
 
 
-__inline__ int 
+inline int 
 __objc_write_selector (struct objc_typed_stream *stream, SEL selector)
 {
   const char *sel_name;
@@ -501,7 +501,7 @@ objc_write_selector (struct objc_typed_stream *stream, SEL selector)
 ** Read operations 
 */
 
-__inline__ int
+inline int
 objc_read_char (struct objc_typed_stream *stream, char *val)
 {
   unsigned char buf;
@@ -528,7 +528,7 @@ objc_read_char (struct objc_typed_stream *stream, char *val)
 }
 
 
-__inline__ int
+inline int
 objc_read_unsigned_char (struct objc_typed_stream *stream, unsigned char *val)
 {
   unsigned char buf;
@@ -549,7 +549,7 @@ objc_read_unsigned_char (struct objc_typed_stream *stream, unsigned char *val)
   return len;
 }
 
-__inline__ int
+inline int
 objc_read_short (struct objc_typed_stream *stream, short *value)
 {
   unsigned char buf[sizeof (short) + 1];
@@ -577,7 +577,7 @@ objc_read_short (struct objc_typed_stream *stream, short *value)
   return len;
 }
 
-__inline__ int
+inline int
 objc_read_unsigned_short (struct objc_typed_stream *stream,
 			  unsigned short *value)
 {
@@ -605,7 +605,7 @@ objc_read_unsigned_short (struct objc_typed_stream *stream,
 }
 
 
-__inline__ int
+inline int
 objc_read_int (struct objc_typed_stream *stream, int *value)
 {
   unsigned char buf[sizeof (int) + 1];
@@ -632,7 +632,7 @@ objc_read_int (struct objc_typed_stream *stream, int *value)
   return len;
 }
 
-__inline__ int
+inline int
 objc_read_long (struct objc_typed_stream *stream, long *value)
 {
   unsigned char buf[sizeof (long) + 1];
@@ -659,7 +659,7 @@ objc_read_long (struct objc_typed_stream *stream, long *value)
   return len;
 }
 
-__inline__ int
+inline int
 __objc_read_nbyte_uint (struct objc_typed_stream *stream,
 			unsigned int nbytes, unsigned int *val)
 {
@@ -678,7 +678,7 @@ __objc_read_nbyte_uint (struct objc_typed_stream *stream,
 }
   
 
-__inline__ int
+inline int
 objc_read_unsigned_int (struct objc_typed_stream *stream,
 			unsigned int *value)
 {
@@ -715,7 +715,7 @@ __objc_read_nbyte_ulong (struct objc_typed_stream *stream,
 }
   
 
-__inline__ int
+inline int
 objc_read_unsigned_long (struct objc_typed_stream *stream,
 			 unsigned long *value)
 {
@@ -733,7 +733,7 @@ objc_read_unsigned_long (struct objc_typed_stream *stream,
   return len;
 }
 
-__inline__ int
+inline int
 objc_read_string (struct objc_typed_stream *stream,
 		  char **string)
 {
diff --git a/libobjc/encoding.c b/libobjc/encoding.c
index 17bc8d4e2e1..2a3b2a4840a 100644
--- a/libobjc/encoding.c
+++ b/libobjc/encoding.c
@@ -84,8 +84,6 @@ Boston, MA 02111-1307, USA.  */
 
 /* Some ROUND_TYPE_ALIGN macros use TARGET_foo, and consequently
    target_flags.  Define a dummy entry here to so we don't die.  */
-/* ??? FIXME: As of 2002-06-21, the attribute `unused' doesn't seem to
-   eliminate the warning.  */
 static int __attribute__ ((__unused__)) target_flags = 0;
 
 
diff --git a/libobjc/sendmsg.c b/libobjc/sendmsg.c
index 0214e77afcd..f8234b7ba12 100644
--- a/libobjc/sendmsg.c
+++ b/libobjc/sendmsg.c
@@ -26,6 +26,8 @@ Boston, MA 02111-1307, USA.  */
    covered by the GNU General Public License.  */
 
 /* FIXME: This file has no business including tm.h.  */
+/* FIXME: This should be using libffi instead of __builtin_apply
+   and friends.  */
 
 #include "tconfig.h"
 #include "coretypes.h"
@@ -35,7 +37,7 @@ Boston, MA 02111-1307, USA.  */
 #include "encoding.h"
 #include "runtime-info.h"
 
-/* this is how we hack STRUCT_VALUE to be 1 or 0 */
+/* This is how we hack STRUCT_VALUE to be 1 or 0.   */
 #define gen_rtx(args...) 1
 #define gen_rtx_MEM(args...) 1
 #define gen_rtx_REG(args...) 1
@@ -83,7 +85,7 @@ Method_t search_for_method_in_list (MethodList_t list, SEL op);
 id nil_method (id, SEL);
 
 /* Given a selector, return the proper forwarding implementation. */
-__inline__
+inline
 IMP
 __objc_get_forward_imp (SEL sel)
 {
@@ -115,7 +117,7 @@ __objc_get_forward_imp (SEL sel)
 }
 
 /* Given a class and selector, return the selector's implementation.  */
-__inline__
+inline
 IMP
 get_imp (Class class, SEL sel)
 {
@@ -176,7 +178,7 @@ get_imp (Class class, SEL sel)
 /* Query if an object can respond to a selector, returns YES if the
 object implements the selector otherwise NO.  Does not check if the
 method can be forwarded. */
-__inline__
+inline
 BOOL
 __objc_responds_to (id object, SEL sel)
 {
@@ -201,7 +203,7 @@ __objc_responds_to (id object, SEL sel)
 /* This is the lookup function.  All entries in the table are either a 
    valid method *or* zero.  If zero then either the dispatch table
    needs to be installed or it doesn't exist and forwarding is attempted. */
-__inline__
+inline
 IMP
 objc_msg_lookup (id receiver, SEL op)
 {
@@ -705,7 +707,7 @@ __objc_print_dtable_stats ()
 /* Returns the uninstalled dispatch table indicator.
  If a class' dispatch table points to __objc_uninstalled_dtable
  then that means it needs its dispatch table to be installed. */
-__inline__
+inline
 struct sarray *
 objc_get_uninstalled_dtable ()
 {