Update to C99, s/__FUNCTION__/__func__/,

also don't use ANSI string concatenation.

3 files changed, 6 insertions, 6 deletions

diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c
index 3ea816b..01edae4 100644
--- a/sys/i386/ibcs2/imgact_coff.c
+++ b/sys/i386/ibcs2/imgact_coff.c
@@ -276,7 +276,7 @@ coff_load_file(struct thread *td, char *name)
 	if (vm_map_remove(kernel_map,
 			  (vm_offset_t) ptr,
 			  (vm_offset_t) ptr + PAGE_SIZE))
-    		panic(__FUNCTION__ " vm_map_remove failed");
+    		panic("%s vm_map_remove failed", __func__);
 
  fail:
 	VOP_UNLOCK(vp, 0, td);
diff --git a/sys/i386/include/i4b_debug.h b/sys/i386/include/i4b_debug.h
index d9380f7..084623a 100644
--- a/sys/i386/include/i4b_debug.h
+++ b/sys/i386/include/i4b_debug.h
@@ -51,19 +51,19 @@ extern unsigned int i4b_l4_debug;
 
 #define NDBGL1(bits, fmt, args...)				 	\
 	if(bits & i4b_l1_debug)						\
-	{ printf("i4b-L1 %s: " fmt "\n", __FUNCTION__ , ##args ); }
+	{ printf("i4b-L1 %s: " fmt "\n", __func__ , ##args ); }
 
 #define NDBGL2(bits, fmt, args...)				 	\
 	if(bits & i4b_l2_debug)						\
-	{ printf("i4b-L2 %s: " fmt "\n", __FUNCTION__ , ##args ); }
+	{ printf("i4b-L2 %s: " fmt "\n", __func__ , ##args ); }
 	
 #define NDBGL3(bits, fmt, args...)				 	\
 	if(bits & i4b_l3_debug)						\
-	{ printf("i4b-L3 %s: " fmt "\n", __FUNCTION__ , ##args ); }
+	{ printf("i4b-L3 %s: " fmt "\n", __func__ , ##args ); }
 	
 #define NDBGL4(bits, fmt, args...)				 	\
 	if(bits & i4b_l4_debug)						\
-	{ printf("i4b-L4 %s: " fmt "\n", __FUNCTION__ , ##args ); }
+	{ printf("i4b-L4 %s: " fmt "\n", __func__ , ##args ); }
 	
 #else /* !DO_I4B_DEBUG */
 
diff --git a/sys/i386/isa/pcf.c b/sys/i386/isa/pcf.c
index b30b2c6..e4f8a69 100644
--- a/sys/i386/isa/pcf.c
+++ b/sys/i386/isa/pcf.c
@@ -468,7 +468,7 @@ pcfintr(void *arg)
 			break;
 
 		    default:
-			panic("%s: unknown slave mode (%d)!", __FUNCTION__,
+			panic("%s: unknown slave mode (%d)!", __func__,
 				pcf->pcf_slave_mode);
 		    }