mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-15 03:01:09 +08:00
Factor }' out of #if/...}/#else...}/#endif, so Emacs can match
{' against `}'
This commit is contained in:
parent
7fcc258d28
commit
1e836c56bc
@ -481,6 +481,7 @@ slapd_daemon_task(
|
|||||||
FD_CLR( writefds.fd_array[i], &readfds );
|
FD_CLR( writefds.fd_array[i], &readfds );
|
||||||
slapd_close( writefds.fd_array[i] );
|
slapd_close( writefds.fd_array[i] );
|
||||||
}
|
}
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
for ( i = 0; i < nfds; i++ ) {
|
for ( i = 0; i < nfds; i++ ) {
|
||||||
if ( i == tcps ) {
|
if ( i == tcps ) {
|
||||||
@ -500,9 +501,9 @@ slapd_daemon_task(
|
|||||||
slapd_close( i );
|
slapd_close( i );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
}
|
|
||||||
#ifdef HAVE_WINSOCK
|
#ifdef HAVE_WINSOCK
|
||||||
for ( i = 0; i < readfds.fd_count; i++ ) {
|
for ( i = 0; i < readfds.fd_count; i++ ) {
|
||||||
if ( readfds.fd_array[i] == tcps ) {
|
if ( readfds.fd_array[i] == tcps ) {
|
||||||
|
@ -106,10 +106,11 @@ main( int argc, char **argv )
|
|||||||
switch ( i ) {
|
switch ( i ) {
|
||||||
case 'a': /* bind address */
|
case 'a': /* bind address */
|
||||||
#ifdef HAVE_WINSOCK
|
#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
|
#else
|
||||||
if(!inet_aton(optarg, &bind_addr.sin_addr)) {
|
if(!inet_aton(optarg, &bind_addr.sin_addr))
|
||||||
#endif
|
#endif
|
||||||
|
{
|
||||||
fprintf(stderr, "invalid address (%s) for -a option", optarg);
|
fprintf(stderr, "invalid address (%s) for -a option", optarg);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -545,10 +545,11 @@ edit_entry( char c, Datum *data )
|
|||||||
fclose( fp );
|
fclose( fp );
|
||||||
|
|
||||||
#ifdef HAVE_WAITPID
|
#ifdef HAVE_WAITPID
|
||||||
if ( waitpid( (pid_t) -1, NULL, WAIT_FLAGS ) < 0 ) {
|
if ( waitpid( (pid_t) -1, NULL, WAIT_FLAGS ) < 0 )
|
||||||
#else
|
#else
|
||||||
if ( wait4( (pid_t) -1, &status, WAIT_FLAGS, 0 ) < 0 ) {
|
if ( wait3( (pid_t) -1, &status, WAIT_FLAGS, 0 ) < 0 )
|
||||||
#endif
|
#endif
|
||||||
|
{
|
||||||
perror( "wait" );
|
perror( "wait" );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user