Commit 6bcac12f authored by Jeff Trawick's avatar Jeff Trawick
Browse files

fix the type of ap_my_pid and make it static since it is used 

in only one file per build (prefork.c or threaded.c)
PR:		6980


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88423 13f79535-47bb-0310-9956-ffa450edef68
parent cb52a0b2

server/mpm/prefork/mpm.h

+0 −1
Original line number Diff line number Diff line
@@ -74,6 +74,5 @@ 
extern int ap_threads_per_child;

extern int ap_max_daemons_limit;

extern server_rec *ap_server_conf;

extern int ap_my_pid;

extern char ap_coredump_dir[MAX_STRING_LEN];

#endif /* APACHE_MPM_PREFORK_H */

server/mpm/prefork/prefork.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static int one_process = 0; 
static apr_pool_t *pconf;		/* Pool for config stuff */

static apr_pool_t *pchild;		/* Pool for httpd child stuff */



int ap_my_pid;	/* it seems silly to call getpid all the time */

static pid_t ap_my_pid;	/* it seems silly to call getpid all the time */

#ifndef MULTITHREAD

static int my_child_num;

#endif

server/mpm/threaded/mpm.h

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ 
extern int ap_threads_per_child;

extern int ap_max_requests_per_child;

extern int ap_max_daemons_limit;

extern unsigned int ap_my_pid;

extern server_rec *ap_server_conf;

extern char ap_coredump_dir[MAX_STRING_LEN];

server/mpm/threaded/threaded.c

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ int raise_sigstop_flags; 
static apr_pool_t *pconf;		/* Pool for config stuff */

static apr_pool_t *pchild;		/* Pool for httpd child stuff */



unsigned int ap_my_pid; /* Linux getpid() doesn't work except in main 

static pid_t ap_my_pid; /* Linux getpid() doesn't work except in main 

                           thread. Use this instead */

/* Keep track of the number of worker threads currently active */

static int worker_thread_count;