dgaudet 97/06/16 13:04:54
Modified: src conf.h http_main.c
Log:
Remove C++ style comment.
Only define O_BINARY if it isn't already defined (who knows, there may be
some unix out there ...).
Now that O_BINARY is defined for all architectures we can remove some EMX
special cases.
Clean up a signal for consistency.
Revision Changes Path
1.101 +3 -1 apache/src/conf.h
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apache/src/conf.h,v
retrieving revision 1.100
retrieving revision 1.101
diff -C3 -r1.100 -r1.101
*** conf.h 1997/06/15 19:22:24 1.100
--- conf.h 1997/06/16 20:04:51 1.101
***************
*** 504,510 ****
/* Put your NT stuff here - Ambarish */
/* temporarily replace crypt */
! //char *crypt(const char *pw, const char *salt);
#define crypt(buf,salt) (buf)
/* Although DIR_TYPE is dirent (see nt/readdir.h) we need direct.h for
--- 504,510 ----
/* Put your NT stuff here - Ambarish */
/* temporarily replace crypt */
! /* char *crypt(const char *pw, const char *salt); */
#define crypt(buf,salt) (buf)
/* Although DIR_TYPE is dirent (see nt/readdir.h) we need direct.h for
***************
*** 626,632 ****
--- 626,634 ----
#include <fcntl.h>
#include <limits.h>
#define closesocket(s) close(s)
+ #ifndef O_BINARY
#define O_BINARY (0)
+ #endif
#else /* WIN32 */
#include <winsock.h>
1.154 +1 -11 apache/src/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -C3 -r1.153 -r1.154
*** http_main.c 1997/06/16 19:32:50 1.153
--- http_main.c 1997/06/16 20:04:52 1.154
***************
*** 975,986 ****
#else
scoreboard_fname = server_root_relative (p, scoreboard_fname);
- #ifdef __EMX__
- /* OS/2 needs binary mode set. */
scoreboard_fd = popenf(p, scoreboard_fname, O_CREAT|O_BINARY|O_RDWR,
0644);
- #else
- scoreboard_fd = popenf(p, scoreboard_fname, O_CREAT|O_RDWR, 0644);
- #endif
if (scoreboard_fd == -1)
{
perror (scoreboard_fname);
--- 975,981 ----
***************
*** 1001,1012 ****
#ifdef SCOREBOARD_FILE
if (scoreboard_fd != -1) pclosef (p, scoreboard_fd);
- #ifdef __EMX__
- /* OS/2 needs binary mode set. */
scoreboard_fd = popenf(p, scoreboard_fname, O_CREAT|O_BINARY|O_RDWR,
0666);
- #else
- scoreboard_fd = popenf(p, scoreboard_fname, O_CREAT|O_RDWR, 0666);
- #endif
if (scoreboard_fd == -1)
{
perror (scoreboard_fname);
--- 996,1002 ----
***************
*** 1501,1507 ****
signal (SIGHUP, (void (*)(int))restart);
#endif /* SIGHUP */
#ifdef SIGUSR1
! signal (SIGUSR1, (void (*)())restart);
#endif /* SIGUSR1 */
#endif
}
--- 1491,1497 ----
signal (SIGHUP, (void (*)(int))restart);
#endif /* SIGHUP */
#ifdef SIGUSR1
! signal (SIGUSR1, (void (*)(int))restart);
#endif /* SIGUSR1 */
#endif
}
