From bae272fe224b5cc7e6b97eb2b3df94668441bdf4 Mon Sep 17 00:00:00 2001
From: Jim Warner <james.warner@comcast.net>
Date: Fri, 6 Apr 2018 00:00:00 -0500
Subject: [PATCH] library: eliminate inappropriate '__BEGIN_DECLS' macro

This patch simply eliminates that glibc specific macro
from all header files which contain no public callable
functions. After all, if user code can't link to them,
then protection from C++ name mangling is unnecessary.

[ we also remove any related '#include <features.h>' ]

Signed-off-by: Jim Warner <james.warner@comcast.net>
---
 include/signals.h | 3 ---
 proc/devname.h    | 5 -----
 proc/escape.h     | 4 ----
 proc/numa.h       | 6 ------
 proc/pwcache.h    | 5 -----
 proc/readproc.h   | 3 ---
 proc/wchan.h      | 6 ------
 7 files changed, 32 deletions(-)

diff --git a/include/signals.h b/include/signals.h
index 695b2997..db23e9fc 100644
--- a/include/signals.h
+++ b/include/signals.h
@@ -11,8 +11,6 @@
  * GNU Library General Public License for more details.
  */
 
-__BEGIN_DECLS
-
 extern const int number_of_signals;
 
 extern const char *get_sigtable_name(int row);
@@ -32,5 +30,4 @@ extern void pretty_print_signals(void);
 
 extern void unix_print_signals(void);
 
-__END_DECLS
 #endif
diff --git a/proc/devname.h b/proc/devname.h
index 1c6e39ff..467cd294 100644
--- a/proc/devname.h
+++ b/proc/devname.h
@@ -1,15 +1,10 @@
 #ifndef PROC_DEVNAME_H
 #define PROC_DEVNAME_H
 
-#include <features.h>
-
-__BEGIN_DECLS
-
 #define ABBREV_DEV  1     /* remove /dev/         */
 #define ABBREV_TTY  2     /* remove tty           */
 #define ABBREV_PTS  4     /* remove pts/          */
 
 unsigned dev_to_tty(char *__restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags);
 
-__END_DECLS
 #endif
diff --git a/proc/escape.h b/proc/escape.h
index a2494da6..871ac761 100644
--- a/proc/escape.h
+++ b/proc/escape.h
@@ -1,11 +1,8 @@
 #ifndef PROCPS_PROC_ESCAPE_H
 #define PROCPS_PROC_ESCAPE_H
 
-#include <features.h>
 #include "readproc.h"
 
-__BEGIN_DECLS
-
 
 #define ESC_ARGS     0x1  // try to use cmdline instead of cmd
 #define ESC_BRACKETS 0x2  // if using cmd, put '[' and ']' around it
@@ -14,5 +11,4 @@ __BEGIN_DECLS
 
 int escape_command(char *__restrict const outbuf, const proc_t *__restrict const pp, int bytes, int *cells, unsigned flags);
 
-__END_DECLS
 #endif
diff --git a/proc/numa.h b/proc/numa.h
index c198d9dc..00113ea9 100644
--- a/proc/numa.h
+++ b/proc/numa.h
@@ -20,16 +20,10 @@
 #ifndef PROCPS_NUMA_H
 #define PROCPS_NUMA_H
 
-#include <features.h>
-
-__BEGIN_DECLS
-
 void numa_init (void);
 void numa_uninit (void);
 
 extern int (*numa_max_node) (void);
 extern int (*numa_node_of_cpu) (int);
 
-__END_DECLS
-
 #endif
diff --git a/proc/pwcache.h b/proc/pwcache.h
index 3c91674f..e1bf0e8a 100644
--- a/proc/pwcache.h
+++ b/proc/pwcache.h
@@ -1,17 +1,12 @@
 #ifndef PROCPS_PROC_PWCACHE_H
 #define PROCPS_PROC_PWCACHE_H
 
-#include <features.h>
 #include <sys/types.h>
 
-__BEGIN_DECLS
-
 // used in pwcache and in readproc to set size of username or groupname
 #define P_G_SZ 33
 
 char *pwcache_get_user(uid_t uid);
 char *pwcache_get_group(gid_t gid);
 
-__END_DECLS
-
 #endif
diff --git a/proc/readproc.h b/proc/readproc.h
index a477570c..ec0acab3 100644
--- a/proc/readproc.h
+++ b/proc/readproc.h
@@ -19,8 +19,6 @@
 // the following is development only, forcing display of "[ duplicate ENUM ]" strings
 // #define FALSE_THREADS        /* set most child string fields to NULL */
 
-__BEGIN_DECLS
-
 
 // This is to help document a transition from pid to tgid/tid caused
 // by the introduction of thread support. It is used in cases where
@@ -261,5 +259,4 @@ proc_t* readeither(PROCTAB *__restrict const PT, proc_t *__restrict x);
 int look_up_our_self(proc_t *p);
 void closeproc(PROCTAB* PT);
 
-__END_DECLS
 #endif
diff --git a/proc/wchan.h b/proc/wchan.h
index 5a54862b..926dbeb3 100644
--- a/proc/wchan.h
+++ b/proc/wchan.h
@@ -1,12 +1,6 @@
 #ifndef PROCPS_PROC_WCHAN_H
 #define PROCPS_PROC_WCHAN_H
 
-#include <features.h>
-
-__BEGIN_DECLS
-
 extern const char * lookup_wchan (int pid);
 
-__END_DECLS
-
 #endif