httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/time/win32 timestr.c
Date Sat, 27 May 2000 22:30:14 GMT
wrowe       00/05/27 15:30:14

  Modified:    src/lib/apr/include apr.hw
               src/lib/apr/misc/unix getopt.c
               src/lib/apr/time/unix timestr.c
               src/lib/apr/time/win32 timestr.c
  Log:
    Reverse out APR_EXPORT_VAR to APR_VAR_EXPORT from early this week,
    to maintain consistency with the Apache core project.
  
  Revision  Changes    Path
  1.13      +3 -3      apache-2.0/src/lib/apr/include/apr.hw
  
  Index: apr.hw
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr.hw,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- apr.hw	2000/05/26 16:23:11	1.12
  +++ apr.hw	2000/05/27 22:30:10	1.13
  @@ -168,18 +168,18 @@
   #if defined(APR_EXPORT_SYMBOLS)
   #define APR_EXPORT(type)         __declspec(dllexport) type 
   #define APR_EXPORT_NONSTD(type)  __declspec(dllexport) type 
  -#define APR_EXPORT_VAR           __declspec(dllexport)
  +#define APR_VAR_EXPORT           __declspec(dllexport)
   #define APR_IMPORT_VAR           extern __declspec(dllexport)
   #elif defined(APR_STATIC)
   #define APR_EXPORT(type)         type
   #define APR_EXPORT_NONSTD(type)  type
  -#define APR_EXPORT_VAR
  +#define APR_VAR_EXPORT
   #define APR_IMPORT_VAR           extern
   #else
   /* Default behavior is to import the shared .dll */
   #define APR_EXPORT(type)         __declspec(dllimport) type 
   #define APR_EXPORT_NONSTD(type)  __declspec(dllimport) type 
  -#define APR_EXPORT_VAR           __declspec(dllimport)
  +#define APR_VAR_EXPORT           __declspec(dllimport)
   #define APR_IMPORT_VAR           extern __declspec(dllimport)
   #endif
   
  
  
  
  1.14      +2 -2      apache-2.0/src/lib/apr/misc/unix/getopt.c
  
  Index: getopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/getopt.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- getopt.c	2000/05/26 18:54:00	1.13
  +++ getopt.c	2000/05/27 22:30:11	1.14
  @@ -33,12 +33,12 @@
   
   #include "misc.h"
   
  -APR_EXPORT_VAR int
  +APR_VAR_EXPORT int
       ap_opterr = 1,                      /* if error message should be printed */
       ap_optind = 1,                      /* index into parent argv vector */
       ap_optopt,                          /* character checked for validity */
       ap_optreset;                        /* reset getopt */
  -APR_EXPORT_VAR char *ap_optarg = "";    /* argument associated with option */
  +APR_VAR_EXPORT char *ap_optarg = "";    /* argument associated with option */
   
   #define EMSG    ""
   
  
  
  
  1.12      +2 -2      apache-2.0/src/lib/apr/time/unix/timestr.c
  
  Index: timestr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/timestr.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- timestr.c	2000/05/26 16:23:36	1.11
  +++ timestr.c	2000/05/27 22:30:12	1.12
  @@ -57,11 +57,11 @@
   
   #include <string.h>
   
  -APR_EXPORT_VAR const char ap_month_snames[12][4] =
  +APR_VAR_EXPORT const char ap_month_snames[12][4] =
   {
       "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
   };
  -APR_EXPORT_VAR const char ap_day_snames[7][4] =
  +APR_VAR_EXPORT const char ap_day_snames[7][4] =
   {
       "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
   };
  
  
  
  1.6       +2 -2      apache-2.0/src/lib/apr/time/win32/timestr.c
  
  Index: timestr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/win32/timestr.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- timestr.c	2000/05/26 16:23:37	1.5
  +++ timestr.c	2000/05/27 22:30:12	1.6
  @@ -55,11 +55,11 @@
   #include "atime.h"
   #include "apr_portable.h"
   
  -APR_EXPORT_VAR const char ap_month_snames[12][4] =
  +APR_VAR_EXPORT const char ap_month_snames[12][4] =
   {
       "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
   };
  -APR_EXPORT_VAR const char ap_day_snames[7][4] =
  +APR_VAR_EXPORT const char ap_day_snames[7][4] =
   {
       "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
   };
  
  
  

Mime
View raw message