Use __FUNCTION__ (c99) replacing __func__ (c90)

4 files changed, 22 insertions, 22 deletions

diff --git a/configure.ac b/configure.ac
index 7e3f9fec..10ff8708 100644
--- a/configure.ac
+++ b/configure.ac
@@ -311,9 +311,9 @@ AC_C_CONST
 AC_C_BIGENDIAN
 AC_C_INLINE
 
-AC_MSG_CHECKING(whether __func__ is available)
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main() { printf(__func__); }])],
-    [AC_DEFINE([HAVE___FUNC__], [1], [Is __func__ available])
+AC_MSG_CHECKING(whether __FUNCTION__ is available)
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main() { printf(__FUNCTION__); }])],
+    [AC_DEFINE([HAVE___FUNCTION__], [1], [Is __FUNCTION__ available])
      AC_MSG_RESULT(yes)],
     [AC_MSG_RESULT(no)])
 
diff --git a/src/parsedate.y b/src/parsedate.y
index 12d6fea7..4085c30a 100644
--- a/src/parsedate.y
+++ b/src/parsedate.y
@@ -822,7 +822,7 @@ ToHour(int Hours, MERIDIAN Meridian)
     default:
 #ifdef RAPTOR_DEBUG
       fprintf(stderr, "%s:%d:%s: UNKNOWN Meridian %d - add a new case", 
-              __FILE__, __LINE__, __func__, (int)Meridian);
+              __FILE__, __LINE__, __FUNCTION__, (int)Meridian);
 #endif
       return -1;
     }
diff --git a/src/raptor_internal.h b/src/raptor_internal.h
index ca6a734a..9c989c83 100644
--- a/src/raptor_internal.h
+++ b/src/raptor_internal.h
@@ -76,9 +76,9 @@ void raptor_sign_free(void *ptr);
 
 #endif
 
-#ifdef HAVE___FUNC__
+#ifdef HAVE___FUNCTION__
 #else
-#define __func__ "???"
+#define __FUNCTION__ "???"
 #endif
 
 #ifndef RAPTOR_DEBUG_FH
@@ -87,12 +87,12 @@ void raptor_sign_free(void *ptr);
 
 #ifdef RAPTOR_DEBUG
 /* Debugging messages */
-#define RAPTOR_DEBUG1(msg) do {fprintf(RAPTOR_DEBUG_FH, "%s:%d:%s: " msg, __FILE__, __LINE__, __func__); } while(0)
-#define RAPTOR_DEBUG2(msg, arg1) do {fprintf(RAPTOR_DEBUG_FH, "%s:%d:%s: " msg, __FILE__, __LINE__, __func__, arg1);} while(0)
-#define RAPTOR_DEBUG3(msg, arg1, arg2) do {fprintf(RAPTOR_DEBUG_FH, "%s:%d:%s: " msg, __FILE__, __LINE__, __func__, arg1, arg2);} while(0)
-#define RAPTOR_DEBUG4(msg, arg1, arg2, arg3) do {fprintf(RAPTOR_DEBUG_FH, "%s:%d:%s: " msg, __FILE__, __LINE__, __func__, arg1, arg2, arg3);} while(0)
-#define RAPTOR_DEBUG5(msg, arg1, arg2, arg3, arg4) do {fprintf(RAPTOR_DEBUG_FH, "%s:%d:%s: " msg, __FILE__, __LINE__, __func__, arg1, arg2, arg3, arg4);} while(0)
-#define RAPTOR_DEBUG6(msg, arg1, arg2, arg3, arg4, arg5) do {fprintf(RAPTOR_DEBUG_FH, "%s:%d:%s: " msg, __FILE__, __LINE__, __func__, arg1, arg2, arg3, arg4, arg5);} while(0)
+#define RAPTOR_DEBUG1(msg) do {fprintf(RAPTOR_DEBUG_FH, "%s:%d:%s: " msg, __FILE__, __LINE__, __FUNCTION__); } while(0)
+#define RAPTOR_DEBUG2(msg, arg1) do {fprintf(RAPTOR_DEBUG_FH, "%s:%d:%s: " msg, __FILE__, __LINE__, __FUNCTION__, arg1);} while(0)
+#define RAPTOR_DEBUG3(msg, arg1, arg2) do {fprintf(RAPTOR_DEBUG_FH, "%s:%d:%s: " msg, __FILE__, __LINE__, __FUNCTION__, arg1, arg2);} while(0)
+#define RAPTOR_DEBUG4(msg, arg1, arg2, arg3) do {fprintf(RAPTOR_DEBUG_FH, "%s:%d:%s: " msg, __FILE__, __LINE__, __FUNCTION__, arg1, arg2, arg3);} while(0)
+#define RAPTOR_DEBUG5(msg, arg1, arg2, arg3, arg4) do {fprintf(RAPTOR_DEBUG_FH, "%s:%d:%s: " msg, __FILE__, __LINE__, __FUNCTION__, arg1, arg2, arg3, arg4);} while(0)
+#define RAPTOR_DEBUG6(msg, arg1, arg2, arg3, arg4, arg5) do {fprintf(RAPTOR_DEBUG_FH, "%s:%d:%s: " msg, __FILE__, __LINE__, __FUNCTION__, arg1, arg2, arg3, arg4, arg5);} while(0)
 
 #ifndef RAPTOR_ASSERT_DIE
 #define RAPTOR_ASSERT_DIE abort();
@@ -122,7 +122,7 @@ void raptor_sign_free(void *ptr);
 #ifdef RAPTOR_DISABLE_ASSERT_MESSAGES
 #define RAPTOR_ASSERT_REPORT(line)
 #else
-#define RAPTOR_ASSERT_REPORT(msg) fprintf(RAPTOR_DEBUG_FH, "%s:%d: (%s) assertion failed: " msg "\n", __FILE__, __LINE__, __func__);
+#define RAPTOR_ASSERT_REPORT(msg) fprintf(RAPTOR_DEBUG_FH, "%s:%d: (%s) assertion failed: " msg "\n", __FILE__, __LINE__, __FUNCTION__);
 #endif
 
 
@@ -173,10 +173,10 @@ void raptor_sign_free(void *ptr);
 
 
 /* Fatal errors - always happen */
-#define RAPTOR_FATAL1(msg) do {fprintf(RAPTOR_DEBUG_FH, "%s:%d:%s: fatal error: " msg, __FILE__, __LINE__ , __func__); abort();} while(0)
-#define RAPTOR_FATAL2(msg,arg) do {fprintf(RAPTOR_DEBUG_FH, "%s:%d:%s: fatal error: " msg, __FILE__, __LINE__ , __func__, arg); abort();} while(0)
-#define RAPTOR_FATAL3(msg,arg1,arg2) do {fprintf(RAPTOR_DEBUG_FH, "%s:%d:%s: fatal error: " msg, __FILE__, __LINE__ , __func__, arg1, arg2); abort();} while(0)
-#define RAPTOR_FATAL4(msg,arg1,arg2,arg3) do {fprintf(RAPTOR_DEBUG_FH, "%s:%d:%s: fatal error: " msg, __FILE__, __LINE__ , __func__, arg1, arg2, arg3); abort();} while(0)
+#define RAPTOR_FATAL1(msg) do {fprintf(RAPTOR_DEBUG_FH, "%s:%d:%s: fatal error: " msg, __FILE__, __LINE__ , __FUNCTION__); abort();} while(0)
+#define RAPTOR_FATAL2(msg,arg) do {fprintf(RAPTOR_DEBUG_FH, "%s:%d:%s: fatal error: " msg, __FILE__, __LINE__ , __FUNCTION__, arg); abort();} while(0)
+#define RAPTOR_FATAL3(msg,arg1,arg2) do {fprintf(RAPTOR_DEBUG_FH, "%s:%d:%s: fatal error: " msg, __FILE__, __LINE__ , __FUNCTION__, arg1, arg2); abort();} while(0)
+#define RAPTOR_FATAL4(msg,arg1,arg2,arg3) do {fprintf(RAPTOR_DEBUG_FH, "%s:%d:%s: fatal error: " msg, __FILE__, __LINE__ , __FUNCTION__, arg1, arg2, arg3); abort();} while(0)
 
 #define MAX_ASCII_INT_SIZE 13
   
@@ -1371,7 +1371,7 @@ size_t raptor_format_integer(char* buffer, size_t bufsize, int integer, unsigned
 
 #define RAPTOR_CHECK_CONSTRUCTOR_WORLD(world)                           \
   do {                                                                  \
-    if(raptor_check_world_internal(world, __func__))                 \
+    if(raptor_check_world_internal(world, __FUNCTION__))                 \
        return NULL;                                                     \
   } while(0)  
     
diff --git a/src/raptor_rdfxml.c b/src/raptor_rdfxml.c
index cc02430a..bc63f1ad 100644
--- a/src/raptor_rdfxml.c
+++ b/src/raptor_rdfxml.c
@@ -721,7 +721,7 @@ raptor_rdfxml_start_element_handler(void *user_data,
       if(!element->parent->child_state) {
         raptor_parser_fatal_error(rdf_parser,
                                   "%s: Internal error: no parent element child_state set",
-                                  __func__);
+                                  __FUNCTION__);
         return;
       }
 
@@ -2362,7 +2362,7 @@ raptor_rdfxml_start_element_grammar(raptor_parser *rdf_parser,
       default:
         raptor_parser_fatal_error(rdf_parser,
                                   "%s Internal error - unexpected parser state %d - %s",
-                                  __func__,
+                                  __FUNCTION__,
                                   state, raptor_rdfxml_state_as_string(state));
         finished = 1;
 
@@ -2895,7 +2895,7 @@ raptor_rdfxml_end_element_grammar(raptor_parser *rdf_parser,
           default:
             raptor_parser_fatal_error(rdf_parser,
                                       "%s: Internal error in state RAPTOR_STATE_PROPERTYELT - got unexpected content type %s (%d)",
-                                      __func__,
+                                      __FUNCTION__,
                                       raptor_rdfxml_element_content_type_as_string(element->content_type),
                                       element->content_type);
         } /* end switch */
@@ -2907,7 +2907,7 @@ raptor_rdfxml_end_element_grammar(raptor_parser *rdf_parser,
       default:
         raptor_parser_fatal_error(rdf_parser,
                                   "%s: Internal error - unexpected parser state %d - %s",
-                                  __func__,
+                                  __FUNCTION__,
                                   state,
                                   raptor_rdfxml_state_as_string(state));
         finished = 1;