apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr-iconv/lib iconv.c iconv.h
Date Thu, 26 Jul 2001 23:12:59 GMT
wrowe       01/07/26 16:12:59

  Modified:    .        aprutil.dsw
               lib      iconv.c iconv.h
  Log:
    Integration, but this work isn't complete
  
  Revision  Changes    Path
  1.3       +36 -0     apr-util/aprutil.dsw
  
  Index: aprutil.dsw
  ===================================================================
  RCS file: /home/cvs/apr-util/aprutil.dsw,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- aprutil.dsw	2001/05/22 22:33:56	1.2
  +++ aprutil.dsw	2001/07/26 23:12:58	1.3
  @@ -15,6 +15,21 @@
   
   ###############################################################################
   
  +Project: "apriconv"="..\apr-iconv\apriconv.dsp" - Package Owner=<4>
  +
  +Package=<5>
  +{{{
  +}}}
  +
  +Package=<4>
  +{{{
  +    Begin Project Dependency
  +    Project_Dep_Name apr
  +    End Project Dependency
  +}}}
  +
  +###############################################################################
  +
   Project: "aprutil"=".\aprutil.dsp" - Package Owner=<4>
   
   Package=<5>
  @@ -32,6 +47,9 @@
       Begin Project Dependency
       Project_Dep_Name xml
       End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name apriconv
  +    End Project Dependency
   }}}
   
   ###############################################################################
  @@ -48,6 +66,21 @@
   
   ###############################################################################
   
  +Project: "libapriconv"="..\apr-iconv\libapriconv.dsp" - Package Owner=<4>
  +
  +Package=<5>
  +{{{
  +}}}
  +
  +Package=<4>
  +{{{
  +    Begin Project Dependency
  +    Project_Dep_Name libapr
  +    End Project Dependency
  +}}}
  +
  +###############################################################################
  +
   Project: "libaprutil"=".\libaprutil.dsp" - Package Owner=<4>
   
   Package=<5>
  @@ -64,6 +97,9 @@
       End Project Dependency
       Begin Project Dependency
       Project_Dep_Name xml
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name libapriconv
       End Project Dependency
   }}}
   
  
  
  
  1.6       +3 -3      apr-iconv/lib/iconv.c
  
  Index: iconv.c
  ===================================================================
  RCS file: /home/cvs/apr-iconv/lib/iconv.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- iconv.c	2001/06/28 05:45:00	1.5
  +++ iconv.c	2001/07/26 23:12:59	1.6
  @@ -51,7 +51,7 @@
    * APR_BADARG: The ouput arguments are not valid.
    */
   
  -apr_status_t
  +API_DECLARE(apr_status_t)
   apr_iconv(iconv_t cd, const char **inbuf, apr_size_t *inbytesleft,
   	char **outbuf, apr_size_t *outbytesleft, apr_size_t *result)
   {
  @@ -71,7 +71,7 @@
   	    (unsigned char**)outbuf, outbytesleft, result));
   }
   
  -apr_status_t
  +API_DECLARE(apr_status_t)
   apr_iconv_open(const char *to, const char *from, apr_pool_t *ctx, iconv_t *res)
   {
   	struct iconv_converter_desc **idesc;
  @@ -99,7 +99,7 @@
   	return(APR_SUCCESS);
   }
   
  -apr_status_t
  +API_DECLARE(apr_status_t)
   apr_iconv_close(iconv_t cd, apr_pool_t *ctx)
   {
   	struct iconv_converter *icp = (struct iconv_converter *)cd;
  
  
  
  1.10      +45 -3     apr-iconv/lib/iconv.h
  
  Index: iconv.h
  ===================================================================
  RCS file: /home/cvs/apr-iconv/lib/iconv.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- iconv.h	2001/06/28 05:45:00	1.9
  +++ iconv.h	2001/07/26 23:12:59	1.10
  @@ -46,6 +46,48 @@
   #define issetugid() 0
   /* apr additions */
   
  +/**
  + * APR_DECLARE_EXPORT is defined when building the APR dynamic library,
  + * so that all public symbols are exported.
  + *
  + * APR_DECLARE_STATIC is defined when including the APR public headers,
  + * to provide static linkage when the dynamic library may be unavailable.
  + *
  + * APR_DECLARE_STATIC and APR_DECLARE_EXPORT are left undefined when
  + * including the APR public headers, to import and link the symbols from the 
  + * dynamic APR library and assure appropriate indirection and calling 
  + * conventions at compile time.
  + */
  +
  +#if !defined(WIN32)
  +/**
  + * The public APR functions are declared with APR_DECLARE(), so they may
  + * use the most appropriate calling convention.  Public APR functions with 
  + * variable arguments must use APR_DECLARE_NONSTD().
  + *
  + * @deffunc APR_DECLARE(rettype) apr_func(args);
  + */
  +#define API_DECLARE(type)            type
  +/**
  + * The public APR variables are declared with AP_MODULE_DECLARE_DATA.
  + * This assures the appropriate indirection is invoked at compile time.
  + *
  + * @deffunc APR_DECLARE_DATA type apr_variable;
  + * @tip extern APR_DECLARE_DATA type apr_variable; syntax is required for
  + * declarations within headers to properly import the variable.
  + */
  +#define API_DECLARE_DATA
  +#elif defined(API_DECLARE_STATIC)
  +#define API_DECLARE(type)            type __stdcall
  +#define API_DECLARE_DATA
  +#elif defined(API_DECLARE_EXPORT)
  +#define API_DECLARE(type)            __declspec(dllexport) type __stdcall
  +#define API_DECLARE_DATA             __declspec(dllexport)
  +#else
  +#define API_DECLARE(type)            __declspec(dllimport) type __stdcall
  +#define API_DECLARE_DATA             __declspec(dllimport)
  +#endif
  +
   /*
    * iconv_t:	charset conversion descriptor type
    */
  @@ -53,9 +95,9 @@
   
   /* __BEGIN_DECLS */
   
  -apr_status_t	apr_iconv_open(const char *, const char *, apr_pool_t *, iconv_t *);
  -apr_status_t	apr_iconv(iconv_t, const char **, apr_size_t *, char **, apr_size_t *, apr_size_t
*);
  -apr_status_t	apr_iconv_close(iconv_t, apr_pool_t *);
  +API_DECLARE(apr_status_t) apr_iconv_open(const char *, const char *, apr_pool_t *, iconv_t
*);
  +API_DECLARE(apr_status_t) apr_iconv(iconv_t, const char **, apr_size_t *, char **, apr_size_t
*, apr_size_t *);
  +API_DECLARE(apr_status_t) apr_iconv_close(iconv_t, apr_pool_t *);
   
   /* __END_DECLS */
   
  
  
  

Mime
View raw message