From: Karel Zak <kzak@redhat.com>
Date: Wed, 23 May 2012 07:39:40 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/jhuntwork/util-linux
X-Git-Tag: v2.22-rc1~391
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=495b13983ee9a4d2a695d9c8be4dea602162ec9a;p=thirdparty%2Futil-linux.git

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

495b13983ee9a4d2a695d9c8be4dea602162ec9a
diff --cc misc-utils/logger.c
index db3469c3d9,2ab76df10f..d027b78acb
--- a/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) {