From 1e836c56bce7f3f90c84e8e62d1f90264c79f09e Mon Sep 17 00:00:00 2001 From: Hallvard Furuseth Date: Fri, 2 Apr 1999 09:11:26 +0000 Subject: [PATCH] Factor `}' out of #if/...}/#else...}/#endif, so Emacs can match `{' against `}' --- servers/slapd/daemon.c | 3 ++- servers/slapd/main.c | 5 +++-- servers/slapd/tools/ldbmtest.c | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c index 59a75c86cc..15a8bf8efa 100644 --- a/servers/slapd/daemon.c +++ b/servers/slapd/daemon.c @@ -481,6 +481,7 @@ slapd_daemon_task( FD_CLR( writefds.fd_array[i], &readfds ); slapd_close( writefds.fd_array[i] ); } + } #else for ( i = 0; i < nfds; i++ ) { if ( i == tcps ) { @@ -500,9 +501,9 @@ slapd_daemon_task( slapd_close( i ); } } + } #endif - } #ifdef HAVE_WINSOCK for ( i = 0; i < readfds.fd_count; i++ ) { if ( readfds.fd_array[i] == tcps ) { diff --git a/servers/slapd/main.c b/servers/slapd/main.c index e83978cc43..b18db5651c 100644 --- a/servers/slapd/main.c +++ b/servers/slapd/main.c @@ -106,10 +106,11 @@ main( int argc, char **argv ) switch ( i ) { case 'a': /* bind address */ #ifdef HAVE_WINSOCK - if(!(bind_addr.sin_addr.S_un.S_addr = inet_addr(optarg))) { + if(!(bind_addr.sin_addr.S_un.S_addr = inet_addr(optarg))) #else - if(!inet_aton(optarg, &bind_addr.sin_addr)) { + if(!inet_aton(optarg, &bind_addr.sin_addr)) #endif + { fprintf(stderr, "invalid address (%s) for -a option", optarg); } break; diff --git a/servers/slapd/tools/ldbmtest.c b/servers/slapd/tools/ldbmtest.c index 08935704fc..5f24ac54c5 100644 --- a/servers/slapd/tools/ldbmtest.c +++ b/servers/slapd/tools/ldbmtest.c @@ -545,10 +545,11 @@ edit_entry( char c, Datum *data ) fclose( fp ); #ifdef HAVE_WAITPID - if ( waitpid( (pid_t) -1, NULL, WAIT_FLAGS ) < 0 ) { + if ( waitpid( (pid_t) -1, NULL, WAIT_FLAGS ) < 0 ) #else - if ( wait4( (pid_t) -1, &status, WAIT_FLAGS, 0 ) < 0 ) { + if ( wait3( (pid_t) -1, &status, WAIT_FLAGS, 0 ) < 0 ) #endif + { perror( "wait" ); return; } -- 2.39.5