From 6214fcb74ce0308a1a1a57b0d0da9acb81fc9a78 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Wed, 22 Sep 2010 19:47:00 +0000
Subject: [PATCH] Minor Win32 code simplification in sys.c.

---
 src/libzzuf/sys.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/libzzuf/sys.c b/src/libzzuf/sys.c
index bd57141..ee0cbe1 100644
--- a/src/libzzuf/sys.c
+++ b/src/libzzuf/sys.c
@@ -93,9 +93,10 @@ static void insert_funcs(void *module)
     struct { char const *lib, *name; void **old; void *new; }
     diversions[] =
     {
-        { "kernel32.dll", "LoadLibraryA", &LoadLibraryA_orig, LoadLibraryA_new },
-        { "kernel32.dll", "AllocConsole", &AllocConsole_orig, AllocConsole_new },
-        { "kernel32.dll", "AttachConsole", &AttachConsole_orig, AttachConsole_new },
+#define DIVERT(x) { "kernel32.dll", #x, &x##_orig, x##_new }
+        DIVERT(LoadLibraryA),
+        DIVERT(AllocConsole),
+        DIVERT(AttachConsole),
     };
 
     unsigned long dummy;