Merge branch 'master' of https://github.com/jhuntwork/util-linux

diff --cc misc-utils/logger.c
index db3469c3d95ae02cb74e4b30327bc81307f11537,2ab76df10f092e1a8aeee3db6a688d8db9f6f90e..d027b78acb804185b1070a21ae8b8d9b2da9d5fe
--- 1/misc-utils/logger.c
--- 2/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@@ -59,11 -59,11 +59,11 @@@
  #define       SYSLOG_NAMES
  #include <syslog.h>
  
- int   decode __P((char *, CODE *));
- int   pencode __P((char *));
+ int   decode (char *, CODE *);
+ int   pencode (char *);
  
  static int optd = 0;
 -static int udpport = 514;
 +static uint16_t udpport = 514;
  
  static int
  myopenlog(const char *sock) {