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 Sun, 28 May 2000 02:47:10 GMT
wrowe       00/05/27 19:47:10

  Modified:    src/lib/apr/misc/unix getopt.c
               src/lib/apr/include apr.h.in apr.hw apr_getopt.h apr_time.h
               src/lib/apr/time/unix timestr.c
               src/lib/apr/time/win32 timestr.c
  Log:
    Fix the last of the tags APR_EXPORT_VAR and APR_IMPORT_VAR to the
    accepted APR_VAR_EXPORT and APR_VAR_IMPORT.  This patch finally
    includes the apr.h.in file (newly added to my grepper).
  
  Revision  Changes    Path
  1.16      +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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- getopt.c	2000/05/27 23:05:08	1.15
  +++ getopt.c	2000/05/28 02:47:08	1.16
  @@ -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.27      +2 -2      apache-2.0/src/lib/apr/include/apr.h.in
  
  Index: apr.h.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr.h.in,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- apr.h.in	2000/05/26 16:23:11	1.26
  +++ apr.h.in	2000/05/28 02:47:08	1.27
  @@ -96,8 +96,8 @@
   #define APR_THREAD_FUNC
   #define APR_EXPORT(type)         type
   #define APR_EXPORT_NONSTD(type)  type
  -#define APR_IMPORT_VAR           extern
  -#define APR_EXPORT_VAR
  +#define APR_VAR_IMPORT           extern
  +#define APR_VAR_EXPORT
   
   /* Define APR_SSIZE_T_FMT.  
    * If ssize_t is an integer we define it to be "d",
  
  
  
  1.14      +10 -9     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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- apr.hw	2000/05/27 22:30:10	1.13
  +++ apr.hw	2000/05/28 02:47:09	1.14
  @@ -165,22 +165,23 @@
   #define APR_SSIZE_T_FMT          "d"
   #define APR_THREAD_FUNC          __stdcall
   
  -#if defined(APR_EXPORT_SYMBOLS)
  -#define APR_EXPORT(type)         __declspec(dllexport) type 
  -#define APR_EXPORT_NONSTD(type)  __declspec(dllexport) type 
  -#define APR_VAR_EXPORT           __declspec(dllexport)
  -#define APR_IMPORT_VAR           extern __declspec(dllexport)
  -#elif defined(APR_STATIC)
  +#if !defined(WIN32) || defined(APR_STATIC)
  +/* Default Non-WIN32 behavior removes all MSVCisms */
   #define APR_EXPORT(type)         type
   #define APR_EXPORT_NONSTD(type)  type
   #define APR_VAR_EXPORT
  -#define APR_IMPORT_VAR           extern
  +#define APR_VAR_IMPORT           extern
  +#elif defined(APR_EXPORT_SYMBOLS)
  +#define APR_EXPORT(type)         __declspec(dllexport) type 
  +#define APR_EXPORT_NONSTD(type)  __declspec(dllexport) type 
  +#define APR_VAR_EXPORT           __declspec(dllexport)
  +#define APR_VAR_IMPORT           extern __declspec(dllexport)
   #else
  -/* Default behavior is to import the shared .dll */
  +/* Default WIN32 behavior is to import the shared .dll */
   #define APR_EXPORT(type)         __declspec(dllimport) type 
   #define APR_EXPORT_NONSTD(type)  __declspec(dllimport) type 
   #define APR_VAR_EXPORT           __declspec(dllimport)
  -#define APR_IMPORT_VAR           extern __declspec(dllimport)
  +#define APR_VAR_IMPORT           extern __declspec(dllimport)
   #endif
   
   #define ap_signal(a,b) signal(a,b)
  
  
  
  1.11      +2 -2      apache-2.0/src/lib/apr/include/apr_getopt.h
  
  Index: apr_getopt.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_getopt.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- apr_getopt.h	2000/05/26 18:53:58	1.10
  +++ apr_getopt.h	2000/05/28 02:47:09	1.11
  @@ -55,12 +55,12 @@
   #ifndef APR_GETOPT_H
   #define APR_GETOPT_H
   
  -APR_IMPORT_VAR int
  +APR_VAR_IMPORT int
       ap_opterr,                          /* if error message should be printed */
       ap_optind,                          /* index into parent argv vector */
       ap_optopt,                          /* character checked for validity */
       ap_optreset;                        /* reset getopt */
  -APR_IMPORT_VAR char *
  +APR_VAR_IMPORT char *
       ap_optarg;                          /* argument associated with option */
   
   /*
  
  
  
  1.20      +2 -2      apache-2.0/src/lib/apr/include/apr_time.h
  
  Index: apr_time.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_time.h,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- apr_time.h	2000/05/26 16:23:14	1.19
  +++ apr_time.h	2000/05/28 02:47:09	1.20
  @@ -62,8 +62,8 @@
   extern "C" {
   #endif /* __cplusplus */
   
  -APR_IMPORT_VAR const char ap_month_snames[12][4];
  -APR_IMPORT_VAR const char ap_day_snames[7][4];
  +APR_VAR_IMPORT const char ap_month_snames[12][4];
  +APR_VAR_IMPORT const char ap_day_snames[7][4];
   
   /* number of microseconds since 00:00:00 january 1, 1970 UTC */
   typedef ap_int64_t ap_time_t;
  
  
  
  1.14      +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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- timestr.c	2000/05/27 23:05:10	1.13
  +++ timestr.c	2000/05/28 02:47:09	1.14
  @@ -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.8       +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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- timestr.c	2000/05/27 23:05:11	1.7
  +++ timestr.c	2000/05/28 02:47:10	1.8
  @@ -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