2009-12-17 Jerker Back <jerker.back@gmail.com>

        * libc/include/_ansi.h: Add new _EXFNPTR macro for using with
        function pointer arguments.
        * libc/iconv/lib/conv.h: Use _EXFNPTR rather than _EXPARM macro.
        * libc/iconv/lib/ucsconv.h: Ditto.
        * libc/include/stdlib.h: Use new _EXFNPTR macro for function pointers.
        * libc/include/sys/reent.h: Ditto.
        * libc/include/sys/unistd.h: Ditto.
        * libc/search/bsearch.c: Ditto.
        * libc/stdio/fseek.c: Ditto.
        * libc/stdio64/fseeko64.c: Ditto.
        * libc/stdlib/atexit.c: Ditto.
        * libc/stdlib/on_exit.c: Ditto.

2 files changed, 21 insertions, 21 deletions

diff --git a/newlib/libc/iconv/lib/conv.h b/newlib/libc/iconv/lib/conv.h
index 03c7c119d..550f44949 100644
--- a/newlib/libc/iconv/lib/conv.h
+++ b/newlib/libc/iconv/lib/conv.h
@@ -63,7 +63,7 @@ typedef struct
    *   Pointer to conversion-specific data if success. In case of error
    *   returns NULL and sets current thread's/process's errno.
    */
-  _VOID_PTR _EXPARM(open, (struct _reent *rptr,
+  _VOID_PTR _EXFNPTR(open, (struct _reent *rptr,
                           _CONST char *to,
                           _CONST char *from));
   
@@ -81,7 +81,7 @@ typedef struct
    *   When successful, returns (size_t)0. In case of error, sets current
    *   thread's/process's errno and returns (size_t)-1 (same as iconv_open()).
    */
-  size_t _EXPARM(close, (struct _reent *rptr,
+  size_t _EXFNPTR(close, (struct _reent *rptr,
                         _VOID_PTR data));
   
   /* convert - perform encoding conversion.
@@ -114,7 +114,7 @@ typedef struct
    *   Reversible conversions are not counted. In case of error, sets current
    *   thread's/process's errno and returns (size_t)-1 (same as iconv()).
    */
-  size_t _EXPARM(convert, (struct _reent *rptr,
+  size_t _EXFNPTR(convert, (struct _reent *rptr,
                            _VOID_PTR data,
                            _CONST unsigned char **inbuf,
                            size_t *inbytesleft,
@@ -135,7 +135,7 @@ typedef struct
    *   If 'direction' is 0, "from" encoding is tested, else
    *   "to" encoding is tested.
    */
-  _VOID _EXPARM(get_state, (_VOID_PTR data,
+  _VOID _EXFNPTR(get_state, (_VOID_PTR data,
                            mbstate_t *state,
                            int direction));
 
@@ -154,7 +154,7 @@ typedef struct
    *   "to" encoding is set.
    *   Returns 0 if '*state' object has right format, -1 else.
    */
-  int _EXPARM(set_state, (_VOID_PTR data,
+  int _EXFNPTR(set_state, (_VOID_PTR data,
                          mbstate_t *state,
                          int direction));
   
@@ -170,7 +170,7 @@ typedef struct
    *   If 'direction' is 0, "from" encoding is tested, else
    *   "to" encoding is tested.
    */
-  int _EXPARM(get_mb_cur_max, (_VOID_PTR data,
+  int _EXFNPTR(get_mb_cur_max, (_VOID_PTR data,
                               int direction));
   
   /*
@@ -185,7 +185,7 @@ typedef struct
    *   If 'direction' is 0, "from" encoding is tested, else
    *   "to" encoding is tested.
    */
-  int _EXPARM(is_stateful, (_VOID_PTR data,
+  int _EXFNPTR(is_stateful, (_VOID_PTR data,
                            int direction));
   
 } iconv_conversion_handlers_t;
diff --git a/newlib/libc/iconv/lib/ucsconv.h b/newlib/libc/iconv/lib/ucsconv.h
index 3c39f39d3..4bf7174bf 100644
--- a/newlib/libc/iconv/lib/ucsconv.h
+++ b/newlib/libc/iconv/lib/ucsconv.h
@@ -68,7 +68,7 @@ typedef struct
    *   Returns CES-specific data pointer if success. In case of error returns
    *   NULL and sets current thread's/process's errno.
    */
-  _VOID_PTR _EXPARM(init, (struct _reent *rptr,
+  _VOID_PTR _EXFNPTR(init, (struct _reent *rptr,
                           _CONST char *encoding));
 
   /*
@@ -84,7 +84,7 @@ typedef struct
    *   Returns (size_t)0 if success. In case of error returns (size_t)-1 and
    *   sets current thread's/process's errno.
    */
-  size_t _EXPARM(close, (struct _reent *rptr,
+  size_t _EXFNPTR(close, (struct _reent *rptr,
                         _VOID_PTR data));
 
   /*
@@ -96,7 +96,7 @@ typedef struct
    * DESCRIPTION:
    *   Returns encoding's maximum character length.
    */
-  int _EXPARM(get_mb_cur_max, (_VOID_PTR data));
+  int _EXFNPTR(get_mb_cur_max, (_VOID_PTR data));
   
   /*
    * get_state - get current shift state.
@@ -108,7 +108,7 @@ typedef struct
    * DESCRIPTION:
    *   Returns encoding's current shift sequence.
    */
-  _VOID _EXPARM(get_state, (_VOID_PTR data,
+  _VOID _EXFNPTR(get_state, (_VOID_PTR data,
                            mbstate_t *state));
 
   /*
@@ -123,7 +123,7 @@ typedef struct
    *   object is zero-object - reset current shift state.
    *   Returns 0 if '*state' object has right format, -1 else.
    */
-  int _EXPARM(set_state, (_VOID_PTR data,
+  int _EXFNPTR(set_state, (_VOID_PTR data,
                          mbstate_t *state));
 
   /*
@@ -135,7 +135,7 @@ typedef struct
    * DESCRIPTION:
    *   Returns 0 if encoding is stateless, else returns 1.
    */
-  int _EXPARM(is_stateful, (_VOID_PTR data));
+  int _EXFNPTR(is_stateful, (_VOID_PTR data));
   
   /*
    * convert_to_ucs - convert character to UCS.
@@ -155,7 +155,7 @@ typedef struct
    *   returns ICONV_CES_INVALID_CHARACTER. If invalid or incomplete bytes
    *   sequence was met, returns ICONV_CES_BAD_SEQUENCE.
    */
-  ucs4_t _EXPARM(convert_to_ucs, (_VOID_PTR data,
+  ucs4_t _EXFNPTR(convert_to_ucs, (_VOID_PTR data,
                                  _CONST unsigned char **inbuf,
                                  size_t *inbytesleft));
 } iconv_to_ucs_ces_handlers_t;
@@ -172,26 +172,26 @@ typedef struct
 typedef struct
 {
   /* Same as in iconv_to_ucs_ces_handlers_t */
-  _VOID_PTR _EXPARM(init, (struct _reent *rptr,
+  _VOID_PTR _EXFNPTR(init, (struct _reent *rptr,
                           _CONST char *encoding));
 
   /* Same as in iconv_to_ucs_ces_handlers_t */
-  size_t _EXPARM(close, (struct _reent *rptr,
+  size_t _EXFNPTR(close, (struct _reent *rptr,
                         _VOID_PTR data));
 
   /* Same as in iconv_to_ucs_ces_handlers_t */
-  int _EXPARM(get_mb_cur_max, (_VOID_PTR data));
+  int _EXFNPTR(get_mb_cur_max, (_VOID_PTR data));
 
   /* Same as in iconv_to_ucs_ces_handlers_t */
-  _VOID _EXPARM(get_state, (_VOID_PTR data,
+  _VOID _EXFNPTR(get_state, (_VOID_PTR data,
                            mbstate_t *state));
 
   /* Same as in iconv_to_ucs_ces_handlers_t */
-  int _EXPARM(set_state, (_VOID_PTR data,
+  int _EXFNPTR(set_state, (_VOID_PTR data,
                          mbstate_t *state));
 
   /* Same as in iconv_to_ucs_ces_handlers_t */
-  int _EXPARM(is_stateful, (_VOID_PTR data));
+  int _EXFNPTR(is_stateful, (_VOID_PTR data));
   
   /*
    * convert_from_ucs - convert UCS character to destination encoding.
@@ -215,7 +215,7 @@ typedef struct
    *   If there is no corresponding character in destination encoding, returns
    *   ICONV_CES_INVALID_CHARACTER.
    */
-  size_t _EXPARM(convert_from_ucs, (_VOID_PTR data,
+  size_t _EXFNPTR(convert_from_ucs, (_VOID_PTR data,
                                    ucs4_t in,
                                    unsigned char **outbuf,
                                    size_t *outbytesleft));