From: Jim Warner <james.warner@comcast.net>
Date: Sat, 16 Dec 2017 06:00:00 +0000 (-0600)
Subject: library: relocate the typedef used in alloc.h override
X-Git-Tag: v3.3.13rc1~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0003d704ac7338ff61189107124eb8e1cf1643e6;p=procps-ng

library: relocate the typedef used in alloc.h override

There is no longer justification for placing a typedef
employed in overriding that alloc.h message handler in
the procps.h header file. So this commit just moves it
to the alloc.h header file itself where's it's needed!

[ gosh, sure wish i had thought to relocate this guy ]
[ when the changes in the 1st commit shown were made ]

Reference(s):
. most recent related changes
commit 18e5aecd2b61387ebd82c83f6f716e4c8e093272
. place where it *should* have been relocated
commit 2865ded64e72e0bec721dad9b442dab0899ee2b0

Signed-off-by: Jim Warner <james.warner@comcast.net>
---

diff --git a/proc/alloc.h b/proc/alloc.h
index 19c91d78..eedbb2ba 100644
--- a/proc/alloc.h
+++ b/proc/alloc.h
@@ -5,6 +5,8 @@
 
 EXTERN_C_BEGIN
 
+typedef void (*message_fn)(const char *__restrict, ...) __attribute__((format(printf,1,2)));
+
  /* change xalloc_err_handler to override the default fprintf(stderr... */
 extern message_fn xalloc_err_handler;
 
diff --git a/proc/procps.h b/proc/procps.h
index 375d6c69..ec746280 100644
--- a/proc/procps.h
+++ b/proc/procps.h
@@ -87,7 +87,4 @@
 #define HIDDEN_ALIAS(x) extern __typeof(x) x##_direct __attribute__((alias(#x)))
 #endif
 
-
-typedef void (*message_fn)(const char *__restrict, ...) __attribute__((format(printf,1,2)));
-
 #endif