You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by Jim Jagielski <ji...@hyperreal.com> on 1996/06/13 22:33:05 UTC
cvs commit: apache/src conf.h http_main.c
jim 96/06/13 13:33:04
Modified: src conf.h http_main.c
Log:
-Wall warning cleanup
Revision Changes Path
1.13 +3 -0 apache/src/conf.h
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apache/src/conf.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C3 -r1.12 -r1.13
*** conf.h 1996/06/13 02:11:54 1.12
--- conf.h 1996/06/13 20:33:02 1.13
***************
*** 229,234 ****
--- 229,237 ----
#undef FLOCK_SERIALIZED_ACCEPT
#define HAVE_SHMGET
#define MOVEBREAK 0x4000000
+ /* These are to let -Wall compile more cleanly */
+ extern int strcasecmp(const char *, const char *);
+ extern int strncasecmp(const char *,const char *,unsigned);
#elif defined(SVR4)
#define NO_KILLPG
1.39 +10 -4 apache/src/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -C3 -r1.38 -r1.39
*** http_main.c 1996/06/11 15:40:48 1.38
--- http_main.c 1996/06/13 20:33:02 1.39
***************
*** 92,97 ****
--- 92,103 ----
#include <sys/types.h>
#include <sys/ipc.h>
#include <sys/shm.h>
+ #if defined(AUX) /* Aren't defined anyplace */
+ extern char *shmat(int, char *, int);
+ extern int shmctl(int, int, struct shmid_ds *);
+ extern int shmget(key_t, int, int);
+ extern char *sbrk(int);
+ #endif
#endif
#ifdef SecureWare
#include <sys/security.h>
***************
*** 471,477 ****
char errstr[MAX_STRING_LEN];
struct shmid_ds shmbuf;
#ifdef MOVEBREAK
! int obrk;
#endif
if ((shmid = shmget(shmkey, score_size, IPC_CREAT|SHM_R|SHM_W)) == -1)
--- 477,483 ----
char errstr[MAX_STRING_LEN];
struct shmid_ds shmbuf;
#ifdef MOVEBREAK
! char *obrk;
#endif
if ((shmid = shmget(shmkey, score_size, IPC_CREAT|SHM_R|SHM_W)) == -1)
***************
*** 494,500 ****
* To get around this, we move the break point "way up there",
* attach the segment and then move break back down. Ugly
*/
! if ((obrk=sbrk(MOVEBREAK)) == -1)
{
perror("sbrk");
fprintf(stderr, "httpd: Could not move break\n");
--- 500,506 ----
* To get around this, we move the break point "way up there",
* attach the segment and then move break back down. Ugly
*/
! if ((obrk=sbrk(MOVEBREAK)) == (char *)-1)
{
perror("sbrk");
fprintf(stderr, "httpd: Could not move break\n");
***************
*** 540,548 ****
exit(1);
#ifdef MOVEBREAK
! if (obrk == -1)
return; /* nothing else to do */
! if (sbrk(-(MOVEBREAK)) == -1)
{
perror("sbrk");
fprintf(stderr, "httpd: Could not move break back\n");
--- 546,554 ----
exit(1);
#ifdef MOVEBREAK
! if (obrk == (char *)-1)
return; /* nothing else to do */
! if (sbrk(-(MOVEBREAK)) == (char *)-1)
{
perror("sbrk");
fprintf(stderr, "httpd: Could not move break back\n");