Remove usage and defintion of __INLINE__

The __INLINE__ definition is used on one place in the code: sfio.h
In this header, some function are defined as inline functions when the
__INLINE__ definition is set. With the current configuration the
__INLINE__ definition is never set, and the inline functions are never
used. Changing the condition so that __INLINE__ does get set, results in
errors during the compilation process. Therefore this defintion can be
removed.

diff --git a/ast_common.h.in b/ast_common.h.in
index 56eab1138c01cc80e36abc01cdf1c26822ea5e82..cb1ce3c981c4e2c0425377e5afb22828cb7cd079 100644 (file)
--- a/ast_common.h.in
+++ b/ast_common.h.in
@@ -43,14 +43,6 @@
 #  endif
 #endif /*_BEGIN_EXTERNS_*/
 
-/* __INLINE__ is the inline keyword */
-#if !defined(__INLINE__) && defined(__cplusplus)
-#define __INLINE__      inline
-#endif
-#if !defined(__INLINE__) && defined(_WIN32) && !defined(__GNUC__)
-#define __INLINE__      __inline
-#endif
-
 /* dynamic linked library external scope handling */
 #undef extern
 #if defined(_dll_import) && !defined(__EXPORT__) && _DLL_BLD

diff --git a/features/common b/features/common
index 868b4b2a2f676f9451180539c5eda5abe91fc9ff..8c6446c921a24b8bc29baf3561bb8ecf5dac6047 100644 (file)
--- a/features/common
+++ b/features/common
@@ -77,14 +77,6 @@ cat{
        #endif
        #endif /*_BEGIN_EXTERNS_*/
 
-       /* __INLINE__ is the inline keyword */
-       #if !defined(__INLINE__) && defined(__cplusplus)
-       #define __INLINE__      inline
-       #endif
-       #if !defined(__INLINE__) && defined(_WIN32) && !defined(__GNUC__)
-       #define __INLINE__      __inline
-       #endif
-
        /* dynamic linked library external scope handling */
        #undef extern
        #if _dll_import && !defined(__EXPORT__) && _DLL_BLD

diff --git a/lib/sfio/features/common b/lib/sfio/features/common
index 9c8d8a2fd1230eef907e1021b42622e61e9b7602..72c0d80cfa3af3929b9ab96725321137c7fb9376 100644 (file)
--- a/lib/sfio/features/common
+++ b/lib/sfio/features/common
@@ -77,14 +77,6 @@ cat{
        #endif
        #endif /*_BEGIN_EXTERNS_*/
 
-       /* __INLINE__ is the inline keyword */
-       #if !defined(__INLINE__) && defined(__cplusplus)
-       #define __INLINE__      inline
-       #endif
-       #if !defined(__INLINE__) && defined(_WIN32) && !defined(__GNUC__)
-       #define __INLINE__      __inline
-       #endif
-
        /* dynamic linked library external scope handling */
        #undef extern
        #if _dll_import && !defined(__EXPORT__) && _DLL_BLD

diff --git a/lib/sfio/sfio.h b/lib/sfio/sfio.h
index fe2ac1884b9d6f0f7d25b85f9543cf78bbbbba9b..70e6059a1ff275ec82bd579833b62ab107d827a3 100644 (file)
--- a/lib/sfio/sfio.h
+++ b/lib/sfio/sfio.h
@@ -421,55 +421,7 @@ extern "C" {
 #define __sf_stacked(f)        ((f) ? (_SF_(f)->push != (Sfio_t*)0) : 0)
 #define __sf_value(f)  ((f) ? (_SF_(f)->val) : 0)
 #define __sf_slen()    (_Sfi)
-#if defined(__INLINE__) && !defined(_BLD_sfio)
-     __INLINE__ int sfputd(Sfio_t * f, Sfdouble_t v) {
-       return __sf_putd(f, v);
-    } __INLINE__ int sfputl(Sfio_t * f, Sflong_t v) {
-       return __sf_putl(f, v);
-    }
-    __INLINE__ int sfputu(Sfio_t * f, Sfulong_t v) {
-       return __sf_putu(f, v);
-    }
-    __INLINE__ int sfputm(Sfio_t * f, Sfulong_t v, Sfulong_t m) {
-       return __sf_putu(f, v);
-    }
-
-    __INLINE__ int sfputc(Sfio_t * f, int c) {
-       return __sf_putc(f, c);
-    }
-    __INLINE__ int sfgetc(Sfio_t * f) {
-       return __sf_getc(f);
-    }
-
-    __INLINE__ int sfdlen(Sfdouble_t v) {
-       return __sf_dlen(v);
-    }
-    __INLINE__ int sfllen(Sflong_t v) {
-       return __sf_llen(v);
-    }
-    __INLINE__ int sfulen(Sfulong_t v) {
-       return __sf_ulen(v);
-    }
-
-    __INLINE__ int sffileno(Sfio_t * f) {
-       return __sf_fileno(f);
-    }
-    __INLINE__ int sfeof(Sfio_t * f) {
-       return __sf_eof(f);
-    }
-    __INLINE__ int sferror(Sfio_t * f) {
-       return __sf_error(f);
-    }
-    __INLINE__ int sfclrerr(Sfio_t * f) {
-       return __sf_clrerr(f);
-    }
-    __INLINE__ int sfstacked(Sfio_t * f) {
-       return __sf_stacked(f);
-    }
-    __INLINE__ ssize_t sfvalue(Sfio_t * f) {
-       return __sf_value(f);
-    }
-#else
+
 #define sfputd(f,v)                            ( __sf_putd((f),(v))            )
 #define sfputl(f,v)                            ( __sf_putl((f),(v))            )
 #define sfputu(f,v)                            ( __sf_putu((f),(v))            )
@@ -486,7 +438,6 @@ extern "C" {
 #define sfstacked(f)                           ( __sf_stacked(f)               )
 #define sfvalue(f)                             ( __sf_value(f)                 )
 #define sfslen()                               ( __sf_slen()                   )
-#endif /*__INLINE__*/
 #endif                         /* _SFIO_H */
 #ifdef __cplusplus
 }

diff --git a/lib/vmalloc/features/common b/lib/vmalloc/features/common
index 9c8d8a2fd1230eef907e1021b42622e61e9b7602..72c0d80cfa3af3929b9ab96725321137c7fb9376 100644 (file)
--- a/lib/vmalloc/features/common
+++ b/lib/vmalloc/features/common
@@ -77,14 +77,6 @@ cat{
        #endif
        #endif /*_BEGIN_EXTERNS_*/
 
-       /* __INLINE__ is the inline keyword */
-       #if !defined(__INLINE__) && defined(__cplusplus)
-       #define __INLINE__      inline
-       #endif
-       #if !defined(__INLINE__) && defined(_WIN32) && !defined(__GNUC__)
-       #define __INLINE__      __inline
-       #endif
-
        /* dynamic linked library external scope handling */
        #undef extern
        #if _dll_import && !defined(__EXPORT__) && _DLL_BLD

diff --git a/windows/include/ast_common.h b/windows/include/ast_common.h
index 3d5aca486f06590b483c5e9a1a22e1f7b188164c..1edac33741e8af53092ef623b6f554c75a7eca7e 100644 (file)
--- a/windows/include/ast_common.h
+++ b/windows/include/ast_common.h
@@ -35,14 +35,6 @@
 #endif
 #endif /*_BEGIN_EXTERNS_*/
 
-/* __INLINE__ is the inline keyword */
-#if !defined(__INLINE__) && defined(__cplusplus)
-#define __INLINE__     inline
-#endif
-#if !defined(__INLINE__) && defined(_WIN32) && !defined(__GNUC__)
-#define __INLINE__     __inline
-#endif
-
 /* dynamic linked library external scope handling */
 #undef extern
 #if defined(_dll_import) && !defined(__EXPORT__) && defined(_DLL_BLD)