ben 96/07/16 12:57:29
Modified: src conf.h http_bprintf.c http_main.c Log: Fix "long double" warning for IRIX. Revision Changes Path 1.19 +2 -1 apache/src/conf.h Index: conf.h =================================================================== RCS file: /export/home/cvs/apache/src/conf.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C3 -r1.18 -r1.19 *** conf.h 1996/07/09 21:40:13 1.18 --- conf.h 1996/07/16 19:57:25 1.19 *************** *** 93,99 **** #define USE_FCNTL_SERIALIZED_ACCEPT #define HAVE_SHMGET #define HAVE_CRYPT_H ! #elif defined(HPUX) #define HAVE_RESOURCE #undef HAVE_GMTOFF --- 93,100 ---- #define USE_FCNTL_SERIALIZED_ACCEPT #define HAVE_SHMGET #define HAVE_CRYPT_H ! #define NO_LONG_DOUBLE ! #elif defined(HPUX) #define HAVE_RESOURCE #undef HAVE_GMTOFF 1.4 +4 -0 apache/src/http_bprintf.c Index: http_bprintf.c =================================================================== RCS file: /export/home/cvs/apache/src/http_bprintf.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C3 -r1.3 -r1.4 *** http_bprintf.c 1996/06/29 20:02:47 1.3 --- http_bprintf.c 1996/07/16 19:57:25 1.4 *************** *** 29,35 **** --- 29,39 ---- #define max(a,b) (a > b ? a : b) #endif + #ifdef NO_LONG_DOUBLE + #define LONG_DOUBLE double + #else #define LONG_DOUBLE long double + #endif #define FALSE 0 #define TRUE 1 1.49 +8 -2 apache/src/http_main.c Index: http_main.c =================================================================== RCS file: /export/home/cvs/apache/src/http_main.c,v retrieving revision 1.48 retrieving revision 1.49 diff -C3 -r1.48 -r1.49 *** http_main.c 1996/07/16 19:39:13 1.48 --- http_main.c 1996/07/16 19:57:26 1.49 *************** *** 107,112 **** --- 107,116 ---- #include <prot.h> #endif + #include "explain.h" + + DEF_Explain + /* * Actual definitions of config globals... here because this is * for the most part the only code that acts on 'em. (Hmmm... mod_main.c?) *************** *** 839,845 **** { long int bs=0; time_t now; ! short_score new_score_rec=scoreboard_image[child_num]; if (r->sent_bodyct) bgetopt(r->connection->client, BO_BYTECT, &bs); --- 843,849 ---- { long int bs=0; time_t now; ! short_score new_score_rec=scoreboard_image->servers[child_num]; if (r->sent_bodyct) bgetopt(r->connection->client, BO_BYTECT, &bs); *************** *** 861,867 **** new_score_rec.how_long = now - new_score_rec.last_used; #if defined(HAVE_MMAP) || defined(HAVE_SHMGET) ! memcpy(&scoreboard_image[child_num], &new_score_rec, sizeof(short_score)); #else lseek (scoreboard_fd, (long)child_num * sizeof(short_score), 0); force_write (scoreboard_fd, (char*)&new_score_rec, sizeof(short_score)); --- 865,871 ---- new_score_rec.how_long = now - new_score_rec.last_used; #if defined(HAVE_MMAP) || defined(HAVE_SHMGET) ! memcpy(&scoreboard_image->servers[child_num], &new_score_rec, sizeof(short_score)); #else lseek (scoreboard_fd, (long)child_num * sizeof(short_score), 0); force_write (scoreboard_fd, (char*)&new_score_rec, sizeof(short_score)); *************** *** 1663,1668 **** --- 1667,1673 ---- /* Child died... note that it's gone in the scoreboard. */ sync_scoreboard_image(); child_slot = find_child_by_pid (pid); + Explain2("Reaping child %d slot %d",pid,child_slot); if (child_slot >= 0) (void)update_child_status (child_slot, SERVER_DEAD, (request_rec*)NULL); *************** *** 1672,1677 **** --- 1677,1683 ---- if ((count_idle_servers() < daemons_min_free) && (child_slot = find_free_child_num()) >= 0 && child_slot <= daemons_limit) { + Explain1("Starting new child in slot %d",child_slot); (void)update_child_status(child_slot,SERVER_STARTING, (request_rec*)NULL); make_child(server_conf, child_slot);