From 6e551fb6285417f585c419500047004ed47c77f1 Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Mon, 10 Dec 2001 08:09:49 +0000 Subject: Update to C99, s/__FUNCTION__/__func__/, also don't use ANSI string concatenation. --- sys/dev/mlx/mlx.c | 2 +- sys/dev/mlx/mlxvar.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/dev/mlx') diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c index c5c2392b894b..208328266cdf 100644 --- a/sys/dev/mlx/mlx.c +++ b/sys/dev/mlx/mlx.c @@ -1168,7 +1168,7 @@ mlx_periodic_enquiry(struct mlx_command *mc) break; } default: - device_printf(sc->mlx_dev, "%s: unknown command 0x%x", __FUNCTION__, mc->mc_mailbox[0]); + device_printf(sc->mlx_dev, "%s: unknown command 0x%x", __func__, mc->mc_mailbox[0]); break; } diff --git a/sys/dev/mlx/mlxvar.h b/sys/dev/mlx/mlxvar.h index 58c7a4bb13cc..84dad18eb403 100644 --- a/sys/dev/mlx/mlxvar.h +++ b/sys/dev/mlx/mlxvar.h @@ -33,8 +33,8 @@ * 2 - extremely noisy, emit trace items in loops, etc. */ #ifdef MLX_DEBUG -#define debug(level, fmt, args...) do { if (level <= MLX_DEBUG) printf("%s: " fmt "\n", __FUNCTION__ , ##args); } while(0) -#define debug_called(level) do { if (level <= MLX_DEBUG) printf(__FUNCTION__ ": called\n"); } while(0) +#define debug(level, fmt, args...) do { if (level <= MLX_DEBUG) printf("%s: " fmt "\n", __func__ , ##args); } while(0) +#define debug_called(level) do { if (level <= MLX_DEBUG) printf(__func__ ": called\n"); } while(0) #else #define debug(level, fmt, args...) #define debug_called(level) -- cgit v1.3