diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2009-05-09 09:06:58 +0000 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2009-05-09 09:06:58 +0000 |
| commit | ffa068102af3e1199075cf7b1d827900758b289a (patch) | |
| tree | ef66c8e99bbc323687323c77c80e83cdd825e2ac | |
| parent | 5416a584e40b28779daf793adf4dbf6dca65860f (diff) | |
merge r874 from trunk
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@875 ef36b2f9-881f-0410-afb5-c4e39611909c
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | nslcd/nslcd.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 57a06c8..f7dda72 100644 --- a/configure.ac +++ b/configure.ac @@ -238,7 +238,6 @@ AC_CHECK_FUNCS(ether_aton_r ether_ntoa_r,,[AC_CHECK_FUNCS(ether_aton ether_ntoa) # checks for types AC_C_CONST -AC_TYPE_SIGNAL AC_TYPE_MODE_T AC_TYPE_SIZE_T AC_TYPE_UID_T diff --git a/nslcd/nslcd.c b/nslcd/nslcd.c index fbbb10e..8c64c9c 100644 --- a/nslcd/nslcd.c +++ b/nslcd/nslcd.c @@ -222,7 +222,7 @@ static const char *signame(int signum) } /* signal handler for closing down */ -static RETSIGTYPE sigexit_handler(int signum) +static void sigexit_handler(int signum) { int i; nslcd_exitsignal=signum; @@ -491,7 +491,7 @@ static void create_pidfile(const char *filename) } /* try to install signal handler and check result */ -static void install_sighandler(int signum,RETSIGTYPE (*handler) (int)) +static void install_sighandler(int signum,void (*handler) (int)) { struct sigaction act; memset(&act,0,sizeof(struct sigaction)); |