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>

diff --git a/include/signals.h b/include/signals.h
index 695b29971f735a7b23cd67f073f2dac8e717f0c1..db23e9fc5a6b3dbf281b02711bf27f4f60015436 100644 (file)
--- 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 1c6e39ff5ff99383d6b2760990b669d4ffd94a94..467cd2948c79a1b475644c77f93ee260d5b7978f 100644 (file)
--- 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 a2494da68dd2524a8d982ae8316686b981678eb0..871ac76199a28210a3852473486d50eb9e2ec4f2 100644 (file)
--- 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 c198d9dc79314b3cef6ca6ff2224db4c6f890298..00113ea91c4e7219490d5c71a136e044309fc4ff 100644 (file)
--- 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 3c91674fc49a126bcd99e524c7b01497df930295..e1bf0e8aa1df5086c156d46a7b7f2b3a7d7a8899 100644 (file)
--- 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 a477570ca40e5a1aafe95c9d7b0672326f7c53dc..ec0acab30f0755e34f5f8cd69555546d4b4c0060 100644 (file)
--- 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 5a54862b5ced55b3ce4e8e20a9b76fb1a10993a3..926dbeb3e7069f762e2f00bf6c9ce1b7137f4a5a 100644 (file)
--- 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