From c729e67321e689e6109b36f64c9fc31f76c10e35 Mon Sep 17 00:00:00 2001
From: Oliver McFadden <z3ro.geek@gmail.com>
Date: Fri, 11 May 2007 20:09:01 +0000
Subject: r300: Use __FUNCTION__ not __func__.

Just for consistency; most of the code already uses __FUNCTION__.
---
 src/mesa/drivers/dri/r300/r300_emit.h     | 6 +++---
 src/mesa/drivers/dri/r300/r300_fragprog.c | 2 +-
 src/mesa/drivers/dri/r300/r300_render.c   | 2 +-
 src/mesa/drivers/dri/r300/r300_state.c    | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/mesa/drivers/dri/r300/r300_emit.h b/src/mesa/drivers/dri/r300/r300_emit.h
index 5e3efcfcf0..7be098f743 100644
--- a/src/mesa/drivers/dri/r300/r300_emit.h
+++ b/src/mesa/drivers/dri/r300/r300_emit.h
@@ -134,7 +134,7 @@ static __inline__ uint32_t cmdpacify(void)
 		cmd = (drm_radeon_cmd_header_t*)			\
 			r300AllocCmdBuf(rmesa,				\
 					(_n+2),				\
-					__func__);			\
+					__FUNCTION__);			\
 		cmd_reserved=_n+2;					\
 		cmd_written=1;						\
 		cmd[0].i=cmdpacket0((reg), _n+1);			\
@@ -169,7 +169,7 @@ static __inline__ uint32_t cmdpacify(void)
 		cmd = (drm_radeon_cmd_header_t*)			\
 			r300AllocCmdBuf(rmesa,				\
 					(_n+1),				\
-					__func__);			\
+					__FUNCTION__);			\
 		cmd_reserved = _n+2;					\
 		cmd_written =1;						\
 		cmd[0].i = cmdvpu((dest), _n/4);			\
@@ -184,7 +184,7 @@ static __inline__ uint32_t cmdpacify(void)
 		cmd = (drm_radeon_cmd_header_t*)			\
 			r300AllocCmdBuf(rmesa,				\
 					(_n+3),				\
-					__func__);			\
+					__FUNCTION__);			\
 		cmd_reserved = _n+3;					\
 		cmd_written = 2;					\
 		if(_n > 0x3fff) {					\
diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.c b/src/mesa/drivers/dri/r300/r300_fragprog.c
index c6fbe3f9aa..cce8e68586 100644
--- a/src/mesa/drivers/dri/r300/r300_fragprog.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog.c
@@ -57,7 +57,7 @@
  */
 #define ERROR(fmt, args...) do {			\
 		fprintf(stderr, "%s::%s(): " fmt "\n",	\
-			__FILE__, __func__, ##args);	\
+			__FILE__, __FUNCTION__, ##args);	\
 		fp->error = GL_TRUE;			\
 	} while(0)
 
diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c
index 8a567d8afa..d967c69c42 100644
--- a/src/mesa/drivers/dri/r300/r300_render.c
+++ b/src/mesa/drivers/dri/r300/r300_render.c
@@ -260,7 +260,7 @@ static void r300EmitAOS(r300ContextPtr rmesa, GLuint nr, GLuint offset)
 	drm_radeon_cmd_header_t *cmd = NULL;
 
 	if (RADEON_DEBUG & DEBUG_VERTS)
-		fprintf(stderr, "%s: nr=%d, ofs=0x%08x\n", __func__, nr,
+		fprintf(stderr, "%s: nr=%d, ofs=0x%08x\n", __FUNCTION__, nr,
 			offset);
 
 	start_packet3(RADEON_CP_PACKET3_3D_LOAD_VBPNTR, sz - 1);
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index f80ae0ca61..4f25ff7e81 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -248,7 +248,7 @@ static void r300SetBlendState(GLcontext * ctx)
 	default:
 		fprintf(stderr,
 			"[%s:%u] Invalid RGB blend equation (0x%04x).\n",
-			__func__, __LINE__, ctx->Color.BlendEquationRGB);
+			__FUNCTION__, __LINE__, ctx->Color.BlendEquationRGB);
 		return;
 	}
 
@@ -286,7 +286,7 @@ static void r300SetBlendState(GLcontext * ctx)
 	default:
 		fprintf(stderr,
 			"[%s:%u] Invalid A blend equation (0x%04x).\n",
-			__func__, __LINE__, ctx->Color.BlendEquationA);
+			__FUNCTION__, __LINE__, ctx->Color.BlendEquationA);
 		return;
 	}
 
@@ -1919,7 +1919,7 @@ void r300SetupPixelShader(r300ContextPtr rmesa)
 	r300TranslateFragmentShader(rmesa, fp);
 	if (!fp->translated) {
 		fprintf(stderr, "%s: No valid fragment shader, exiting\n",
-			__func__);
+			__FUNCTION__);
 		return;
 	}
 #define OUTPUT_FIELD(st, reg, field)  \
-- 
cgit v1.2.3