Merge remote-tracking branch 'upstream/master'refs/pull/1257/head

Conflicts:
	plugins/netutils.c

1 files changed, 0 insertions, 3 deletions

diff --git a/lib/utils_base.h b/lib/utils_base.h
index d69b0da..42ae0c0 100644
--- a/lib/utils_base.h
+++ b/lib/utils_base.h
@@ -75,9 +75,6 @@ void die (int, const char *, ...) __attribute__((noreturn,format(printf, 2, 3)))
 /* a simple check to see if we're running as root.  
  * returns zero on failure, nonzero on success */
 int np_check_if_root(void);
-/* and a helpful wrapper around that.  it returns the same status
- * code from the above function, in case it's helpful for testing */
-int np_warn_if_not_root(void);
 
 /* mp_suid() returns true if the real and effective uids differs, such as when
  * running a suid plugin */