| OLD | NEW |
| 1 diff --git a/fdwatch.c b/fdwatch.c | 1 diff --git a/fdwatch.c b/fdwatch.c |
| 2 --- a/fdwatch.c | 2 --- a/fdwatch.c |
| 3 +++ b/fdwatch.c | 3 +++ b/fdwatch.c |
| 4 @@ -31,7 +31,7 @@ | 4 @@ -31,7 +31,7 @@ |
| 5 #include <string.h> | 5 #include <string.h> |
| 6 #include <sys/time.h> | 6 #include <sys/time.h> |
| 7 #include <sys/resource.h> | 7 #include <sys/resource.h> |
| 8 -#include <syslog.h> | 8 -#include <syslog.h> |
| 9 +#include "my_syslog.h" | 9 +#include "my_syslog.h" |
| 10 #include <fcntl.h> | 10 #include <fcntl.h> |
| (...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 570 return; | 570 return; |
| 571 } | 571 } |
| 572 - (void) fcntl( fileno( logfp ), F_SETFD, 1 ); | 572 - (void) fcntl( fileno( logfp ), F_SETFD, 1 ); |
| 573 httpd_set_logfp( hs, logfp ); | 573 httpd_set_logfp( hs, logfp ); |
| 574 } | 574 } |
| 575 } | 575 } |
| 576 | 576 |
| 577 | 577 |
| 578 int | 578 int |
| 579 -main( int argc, char** argv ) | 579 -main( int argc, char** argv ) |
| 580 +nacl_main( int argc, char** argv ) | 580 +main( int argc, char** argv ) |
| 581 { | 581 { |
| 582 char* cp; | 582 char* cp; |
| 583 struct passwd* pwd; | 583 struct passwd* pwd; |
| 584 @@ -370,13 +366,11 @@ main( int argc, char** argv ) | 584 @@ -370,13 +366,11 @@ main( int argc, char** argv ) |
| 585 struct timeval tv; | 585 struct timeval tv; |
| 586 | 586 |
| 587 argv0 = argv[0]; | 587 argv0 = argv[0]; |
| 588 - | 588 - |
| 589 cp = strrchr( argv0, '/' ); | 589 cp = strrchr( argv0, '/' ); |
| 590 if ( cp != (char*) 0 ) | 590 if ( cp != (char*) 0 ) |
| (...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 990 | 990 |
| 991 @@ -105,5 +108,8 @@ extern void tmr_destroy( void ); | 991 @@ -105,5 +108,8 @@ extern void tmr_destroy( void ); |
| 992 | 992 |
| 993 /* Generate debugging statistics syslog message. */ | 993 /* Generate debugging statistics syslog message. */ |
| 994 extern void tmr_logstats( long secs ); | 994 extern void tmr_logstats( long secs ); |
| 995 +#ifdef __cplusplus | 995 +#ifdef __cplusplus |
| 996 +} | 996 +} |
| 997 +#endif | 997 +#endif |
| 998 | 998 |
| 999 #endif /* _TIMERS_H_ */ | 999 #endif /* _TIMERS_H_ */ |
| OLD | NEW |