httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grega...@apache.org
Subject cvs commit: httpd-test/specweb99/specweb99-2.0 mod_specweb99.c mod_specweb99.h
Date Fri, 25 Oct 2002 22:04:43 GMT
gregames    2002/10/25 15:04:43

  Modified:    specweb99/specweb99-2.0 mod_specweb99.c mod_specweb99.h
  Log:
  change u_int32_t to apr_uint32_t to allow mod_specweb99 to compile against
  2.0.43 on HPUX.
  
  Submitted by: Madhu Mathihalli <madhusudan_mathihalli@hp.com>
  Reviewed by:  Sander Temme, Greg Ames
  
  Revision  Changes    Path
  1.11      +6 -6      httpd-test/specweb99/specweb99-2.0/mod_specweb99.c
  
  Index: mod_specweb99.c
  ===================================================================
  RCS file: /home/cvs/httpd-test/specweb99/specweb99-2.0/mod_specweb99.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_specweb99.c	18 Oct 2002 21:03:06 -0000	1.10
  +++ mod_specweb99.c	25 Oct 2002 22:04:43 -0000	1.11
  @@ -366,7 +366,7 @@
       if ((_my->up == NULL) || (numrecords > _my->up_count)) {
   	/* User personalities are only 32 bits (sad, really) */
   	apr_pool_clear(_my->up_pool);
  -	_my->up = apr_palloc(_my->up_pool, numrecords * sizeof(u_int32_t));
  +       _my->up = apr_palloc(_my->up_pool, numrecords * sizeof(apr_uint32_t));
   	_my->up_count = numrecords;
       }
       /*
  @@ -823,7 +823,7 @@
    * customadscan                                                        *
    ***********************************************************************/
   
  -static caddr_t customadscan(request_rec *r, char *fname, int16_t adid)
  +static caddr_t customadscan(request_rec *r, char *fname, apr_int16_t adid)
   {
       struct apr_finfo_t s;
       apr_status_t rv;
  @@ -890,9 +890,9 @@
       char *cookie_out;
       const char *docroot = ap_document_root(r);
       char *filename;
  -    int16_t userindex, adindex, expired = 0;
  -    u_int32_t userdemographics, combineddemographics;	/* it's a bitmap */
  -    u_int16_t ad_weight;
  +    apr_int16_t userindex, adindex, expired = 0;
  +    apr_uint32_t userdemographics, combineddemographics; /* it's a bitmap */
  +    apr_uint16_t ad_weight;
   
       /*
        * XXX Again, ap_document_root is deprecated. I should probably find the
  @@ -1006,7 +1006,7 @@
   {
       pid_t pid;
       time_t stamp;
  -    u_int32_t recnum;
  +    apr_uint32_t recnum;
       char recnumstr[12];		/* ten wide plus return plus \0 */
       apr_size_t l;
       apr_off_t zero = 0;
  
  
  
  1.2       +8 -8      httpd-test/specweb99/specweb99-2.0/mod_specweb99.h
  
  Index: mod_specweb99.h
  ===================================================================
  RCS file: /home/cvs/httpd-test/specweb99/specweb99-2.0/mod_specweb99.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mod_specweb99.h	2 May 2002 20:34:13 -0000	1.1
  +++ mod_specweb99.h	25 Oct 2002 22:04:43 -0000	1.2
  @@ -122,14 +122,14 @@
   /* Structure to hold custom ad data */
   
   struct cadrec {
  -    u_int32_t addemographics;
  -    u_int32_t age_weightings;
  -    u_int32_t gen_weightings;
  -    u_int32_t reg_weightings;
  -    u_int32_t int1_weightings;
  -    u_int32_t int2_weightings;
  -    u_int16_t minimum_match_value;
  -    u_int32_t expiration_time;
  +    apr_uint32_t addemographics;
  +    apr_uint32_t age_weightings;
  +    apr_uint32_t gen_weightings;
  +    apr_uint32_t reg_weightings;
  +    apr_uint32_t int1_weightings;
  +    apr_uint32_t int2_weightings;
  +    apr_uint16_t minimum_match_value;
  +    apr_uint32_t expiration_time;
   };
   
   #endif
  
  
  

Mime
View raw message