httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ben Laurie <...@gonzo.ben.algroup.co.uk>
Subject Re: apache-1.1.1/DigitalUnix/gcc-2.7.2
Date Wed, 24 Jul 1996 14:08:59 GMT
Rob Hartill wrote:
> 
> 
> Thanks for the patch. I'll pass it on to the developers for
> consideration.

Hmmm. For one thing, I'd say that POINTER_IS_LONG would be more sensible than
POINTER_IS_NOT_INT. Secondly, it would be considerably less tacky to use
unions instead. If noone is opposed I'm happy enough to make the necessary
changes.

Cheers,

Ben.

> 
> 
> regards,
> rob
> 
> >I tried to fix some pointer-to-int conversions gcc complained about.
> >alloc.c still gives the following warnings
> >
> >gcc -c -O2 -g -DSTATUS -DOSF1 alloc.c
> >alloc.c: In function `fd_cleanup':
> >alloc.c:726: warning: cast from pointer to integer of different size
> >alloc.c: In function `note_cleanups_for_fd':
> >alloc.c:729: warning: cast to pointer from integer of different size
> >alloc.c: In function `pclosef':
> >alloc.c:749: warning: cast to pointer from integer of different size
> >
> >
> >Index: src/conf.h
> >*** apache_1.1.1/src/conf.h	Sat Jun 29 22:02:46 1996
> >--- apache_1.1.1.pi4//src/conf.h	Wed Jul 24 12:49:47 1996
> >***************
> >*** 132,137 ****
> >--- 132,138 ----
> >  #define JMP_BUF sigjmp_buf
> >  #define HAVE_MMAP
> >  #define HAVE_CRYPT_H
> >+ #define POINTER_IS_NOT_INT	1
> >
> >  #elif defined(SEQUENT)
> >  #define HAS_GMTOFF
> >Index: src/http_config.c
> >*** apache_1.1.1/src/http_config.c	Sat Jun 29 21:52:11 1996
> >--- apache_1.1.1.pi4//src/http_config.c	Wed Jul 24 12:50:51 1996
> >***************
> >*** 507,513 ****
> >--- 507,517 ----
> >  {
> >      /* This one's pretty generic... */
> >
> >+ #ifdef POINTER_IS_NOT_INT /* wm 23.Jul.96: shutup gcc on DigitalUnix */
> >+     long offset = (long)cmd->info;
> >+ #else
> >      int offset = (int)cmd->info;
> >+ #endif
> >      *(char **)(struct_ptr + offset) = pstrdup (cmd->pool, arg);
> >      return NULL;
> >  }
> >Index: src/http_core.c
> >*** apache_1.1.1/src/http_core.c	Wed Jun 12 20:14:31 1996
> >--- apache_1.1.1.pi4//src/http_core.c	Wed Jul 24 12:50:57 1996
> >***************
> >*** 616,622 ****
> >--- 616,626 ----
> >  {
> >      /* This one's pretty generic... */
> >
> >+ #ifdef POINTER_IS_NOT_INT /* wm 23.Jul.96: shutup gcc on DigitalUnix */
> >+     long offset = (long)cmd->info;
> >+ #else
> >      int offset = (int)cmd->info;
> >+ #endif
> >      char *struct_ptr = (char *)cmd->server;
> >
> >      *(char **)(struct_ptr + offset) = pstrdup (cmd->pool, arg);
> >Index: src/mod_dir.c
> >*** apache_1.1.1/src/mod_dir.c	Fri Jun 21 22:12:07 1996
> >--- apache_1.1.1.pi4//src/mod_dir.c	Wed Jul 24 12:51:40 1996
> >***************
> >*** 176,182 ****
> >--- 176,186 ----
> >  }
> >
> >
> >+ #ifdef POINTER_IS_NOT_INT /* wm 23.Jul.96: shutup gcc on DigitalUnix */
> >+ char *add_opts_int(cmd_parms *cmd, void *d, long opts) {
> >+ #else
> >  char *add_opts_int(cmd_parms *cmd, void *d, int opts) {
> >+ #endif
> >      push_item(((dir_config_rec *)d)->opts_list, (char*)opts, NULL,
> >  	      cmd->path, NULL);
> >      return NULL;
> >***************
> >*** 384,390 ****
> >--- 388,398 ----
> >      return 0;
> >  }
> >
> >+ #ifdef POINTER_IS_NOT_INT /* wm 23.Jul.96: shutup gcc on DigitalUnix */
> >+ long find_opts(dir_config_rec *d, request_rec *r) {
> >+ #else
> >  int find_opts(dir_config_rec *d, request_rec *r) {
> >+ #endif
> >      char *path = r->filename;
> >      array_header *list = d->opts_list;
> >      struct item *items = (struct item *)list->elts;
> >***************
> >*** 394,400 ****
> >--- 402,412 ----
> >          struct item *p = &items[i];
> >
> >          if(!strcmp_match(path,p->apply_path))
> >+ #ifdef POINTER_IS_NOT_INT /* wm 23.Jul.96: shutup gcc on DigitalUnix */
> >+             return (long)p->type;
> >+ #else
> >              return (int)p->type;
> >+ #endif
> >      }
> >      return 0;
> >  }
> 
> 
> -- 
> Rob Hartill (robh@imdb.com)
> The Internet Movie Database (IMDb)  http://www.imdb.com/
>            ...more movie info than you can poke a stick at.

-- 
Ben Laurie                  Phone: +44 (181) 994 6435
Freelance Consultant and    Fax:   +44 (181) 994 6472
Technical Director          Email: ben@algroup.co.uk
A.L. Digital Ltd,           URL: http://www.algroup.co.uk
London, England.            Apache Group member (http://www.apache.org)

Mime
View raw message