From patrick20@example.org Sun Dec 01 17:08:52 2002 Return-Path: <patrick20@example.org> Delivered-To: patrick20@example.org Received: (qmail 97010 invoked by uid 500); 1 Dec 2002 17:08:52 -0000 Mailing-List: contact patrick20@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:patrick20@example.org> List-Help: <mailto:patrick20@example.org> List-Unsubscribe: <mailto:patrick20@example.org> List-Subscribe: <mailto:patrick20@example.org> Reply-To: patrick20@example.org Delivered-To: mailing list patrick20@example.org Received: (qmail 96999 invoked by uid 500); 1 Dec 2002 17:08:51 -0000 Delivered-To: patrick20@example.org Date: 1 Dec 2002 17:08:51 -0000 Message-ID: <patrick20@example.org> From: patrick20@example.org To: patrick20@example.org Subject: cvs commit: apr-util/include apr_ldap.hw X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N wrowe 2002/12/01 09:08:51 Modified: include apr_ldap.hw Log: Fix erronious lineending Revision Changes Path 1.2 +122 -122 apr-util/include/apr_ldap.hw Index: apr_ldap.hw =================================================================== RCS file: /home/cvs/apr-util/include/apr_ldap.hw,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apr_ldap.hw 9 Oct 2002 08:17:+1-682-471-0228.1 +++ apr_ldap.hw 1 Dec 2002 17:08:51 -0000 1.2 @@ -1,122 +1,122 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000-2002 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact patrick20@example.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - */ - -/* - * apr_ldap.h is generated from apr_ldap.h.in by configure -- do not edit apr_ldap.h - */ -/** - * @file apr_ldap.h - * @brief APR-UTIL LDAP - */ -#ifndef APU_LDAP_H -#define APU_LDAP_H - -/** - * @defgroup APR_Util_LDAP LDAP - * @ingroup APR_Util - * @{ - */ - - -/* - * This switches LDAP support on or off. - */ - -/* this will be defined if LDAP support was compiled into apr-util */ -#define APU_HAS_LDAP - -/* this whole thing disappears if LDAP is not enabled */ -#ifdef APU_HAS_LDAP - -/* LDAP secure capabilities */ -//#define APU_HAS_LDAP_NETSCAPE_SSL -//#define APU_HAS_LDAP_STARTTLS - -/* LDAP header files */ -#include <ldap.h> -#include <lber.h> -#include <ldap_ssl.h> - - -/* - * LDAP Compatibility - */ - -#if LDAP_VERSION_MAX <= 2 -int ldap_search_ext_s(LDAP *ldap, char *base, int scope, char *filter, - char **attrs, int attrsonly, void *servertrls, void *clientctrls, - void *timeout, int sizelimit, LDAPMessage **res); -void ldap_memfree(void *p); - -/* The const_cast is used to get around the fact that some of the LDAPv2 prototypes - * have non-const parameters, while the same ones in LDAPv3 are const. If compiling - * with LDAPv2, the const_cast casts away the constness, but won't under LDAPv3 - */ -#define const_cast(x) ((char *)(x)) -#else -#define const_cast(x) (x) -#endif /* LDAP_VERSION_MAX */ - -/* Define some errors that are mysteriously gone from OpenLDAP 2.x */ -#ifndef LDAP_URL_ERR_NOTLDAP -#define LDAP_URL_ERR_NOTLDAP LDAP_URL_ERR_BADSCHEME -#endif - -#ifndef LDAP_URL_ERR_NODN -#define LDAP_URL_ERR_NODN LDAP_URL_ERR_BADURL -#endif - -/** @} */ -#endif /* APU_HAS_LDAP */ -#endif /* APU_LDAP_H */ +/* ==================================================================== + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2000-2002 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowledgment may appear in the software itself, + * if and wherever such third-party acknowledgments normally appear. + * + * 4. The names "Apache" and "Apache Software Foundation" must + * not be used to endorse or promote products derived from this + * software without prior written permission. For written + * permission, please contact patrick20@example.org. + * + * 5. Products derived from this software may not be called "Apache", + * nor may "Apache" appear in their name, without prior written + * permission of the Apache Software Foundation. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * <http://www.apache.org/>. + */ + +/* + * apr_ldap.h is generated from apr_ldap.h.in by configure -- do not edit apr_ldap.h + */ +/** + * @file apr_ldap.h + * @brief APR-UTIL LDAP + */ +#ifndef APU_LDAP_H +#define APU_LDAP_H + +/** + * @defgroup APR_Util_LDAP LDAP + * @ingroup APR_Util + * @{ + */ + + +/* + * This switches LDAP support on or off. + */ + +/* this will be defined if LDAP support was compiled into apr-util */ +#define APU_HAS_LDAP + +/* this whole thing disappears if LDAP is not enabled */ +#ifdef APU_HAS_LDAP + +/* LDAP secure capabilities */ +//#define APU_HAS_LDAP_NETSCAPE_SSL +//#define APU_HAS_LDAP_STARTTLS + +/* LDAP header files */ +#include <ldap.h> +#include <lber.h> +#include <ldap_ssl.h> + + +/* + * LDAP Compatibility + */ + +#if LDAP_VERSION_MAX <= 2 +int ldap_search_ext_s(LDAP *ldap, char *base, int scope, char *filter, + char **attrs, int attrsonly, void *servertrls, void *clientctrls, + void *timeout, int sizelimit, LDAPMessage **res); +void ldap_memfree(void *p); + +/* The const_cast is used to get around the fact that some of the LDAPv2 prototypes + * have non-const parameters, while the same ones in LDAPv3 are const. If compiling + * with LDAPv2, the const_cast casts away the constness, but won't under LDAPv3 + */ +#define const_cast(x) ((char *)(x)) +#else +#define const_cast(x) (x) +#endif /* LDAP_VERSION_MAX */ + +/* Define some errors that are mysteriously gone from OpenLDAP 2.x */ +#ifndef LDAP_URL_ERR_NOTLDAP +#define LDAP_URL_ERR_NOTLDAP LDAP_URL_ERR_BADSCHEME +#endif + +#ifndef LDAP_URL_ERR_NODN +#define LDAP_URL_ERR_NODN LDAP_URL_ERR_BADURL +#endif + +/** @} */ +#endif /* APU_HAS_LDAP */ +#endif /* APU_LDAP_H */ From patrick20@example.org Mon Dec 02 16:07:12 2002 Return-Path: <patrick20@example.org> Delivered-To: patrick20@example.org Received: (qmail 35177 invoked by uid 500); 2 Dec 2002 16:07:11 -0000 Mailing-List: contact patrick20@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:patrick20@example.org> List-Help: <mailto:patrick20@example.org> List-Unsubscribe: <mailto:patrick20@example.org> List-Subscribe: <mailto:patrick20@example.org> Reply-To: patrick20@example.org Delivered-To: mailing list patrick20@example.org Received: (qmail 35115 invoked from network); 2 Dec 2002 16:07:10 -0000 Date: 2 Dec 2002 16:07:10 -0000 Message-ID: <patrick20@example.org> From: patrick20@example.org To: patrick20@example.org Subject: cvs commit: apr configure.in X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N jorton 2002/12/02 08:07:10 Modified: . configure.in Log: Fix selection of random device on OpenBSD; prefer /dev/arandom over /dev/random, since the latter does not provide random data on OpenBSD. Revision Changes Path 1.506 +3 -1 apr/configure.in Index: configure.in =================================================================== RCS file: /home/cvs/apr/configure.in,v retrieving revision 1.505 retrieving revision 1.506 diff -u -r1.505 -r1.506 --- configure.in 22 Nov 2002 17:01:12 -0000 1.505 +++ configure.in 2 Dec 2002 16:07:09 -0000 1.506 @@ -1628,7 +1628,9 @@ [ apr_devrandom="$withval" ], [ apr_devrandom="yes" ]) if test "$apr_devrandom" = "yes"; then - for f in /dev/random /dev/arandom /dev/urandom; do + # /dev/random on OpenBSD doesn't provide random data, so + # prefer /dev/arandom, which does; see random(4). + for f in /dev/arandom /dev/random /dev/urandom; do if test -r $f; then apr_devrandom=$f rand=1 From patrick20@example.org Mon Dec 02 21:16:47 2002 Return-Path: <patrick20@example.org> Delivered-To: patrick20@example.org Received: (qmail 21442 invoked by uid 500); 2 Dec 2002 21:16:46 -0000 Mailing-List: contact patrick20@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:patrick20@example.org> List-Help: <mailto:patrick20@example.org> List-Unsubscribe: <mailto:patrick20@example.org> List-Subscribe: <mailto:patrick20@example.org> Reply-To: patrick20@example.org Delivered-To: mailing list patrick20@example.org Received: (qmail 21431 invoked from network); 2 Dec 2002 21:16:46 -0000 Date: 2 Dec 2002 21:16:46 -0000 Message-ID: <patrick20@example.org> From: patrick20@example.org To: patrick20@example.org Subject: cvs commit: apr/include apr.hnw X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N bnicholes 2002/12/02 13:16:46 Modified: misc/netware libprews.c include/arch/netware apr_private.h include apr.hnw Log: Moving the application global data management structure to APR.hnw to give it a wider scope. This needs to be done to handle the per-application global data in the apr_util hook APIs. Revision Changes Path 1.8 +3 -7 apr/misc/netware/libprews.c Index: libprews.c =================================================================== RCS file: /home/cvs/apr/misc/netware/libprews.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libprews.c 24 Jul 2002 14:35:43 -0000 1.7 +++ libprews.c 2 Dec 2002 21:16:45 -0000 1.8 @@ -15,13 +15,6 @@ #include "apr_pools.h" -#define MAX_PROCESSORS 128 - -typedef struct app_data { - int initialized; - void* gPool[MAX_PROCESSORS]; - void* statCache[MAX_PROCESSORS]; -} APP_DATA; /* library-private data...*/ int gLibId = -1; @@ -216,3 +209,6 @@ return NULL; } + + + 1.15 +0 -4 apr/include/arch/netware/apr_private.h Index: apr_private.h =================================================================== RCS file: /home/cvs/apr/include/arch/netware/apr_private.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- apr_private.h 7 Nov 2002 19:50:24 -0000 1.14 +++ apr_private.h 2 Dec 2002 21:16:45 -0000 1.15 @@ -160,10 +160,6 @@ void netware_pool_proc_cleanup (); -// library-private data... -extern int gLibId; -extern void *gLibHandle; - /* NLM registration routines for managing which NLMs are using the library. */ int register_NLM(void *NLMHandle); 1.23 +18 -3 apr/include/apr.hnw Index: apr.hnw =================================================================== RCS file: /home/cvs/apr/include/apr.hnw,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- apr.hnw 3 Sep 2002 16:29:35 -0000 1.22 +++ apr.hnw 2 Dec 2002 21:16:45 -0000 1.23 @@ -344,9 +344,24 @@ #define APR_TIME_T_FMT APR_INT64_T_FMT /* Deal with atoi64 variables ... these should move to apr_private.h */ -/* I don't have the answer, perhaps a NetWare hacker will fill this in? */ -#define APR_HAVE_INT64_STRFN 0 -#define APR_INT64_STRFN missing +#define APR_HAVE_INT64_STRFN 1 +#define APR_INT64_STRFN strtoll + +/* Application global data management */ +extern int gLibId; +extern void *gLibHandle; + +#define MAX_PROCESSORS 128 + +typedef struct app_data { + int initialized; + void* gPool[MAX_PROCESSORS]; + void* statCache[MAX_PROCESSORS]; + void* gs_aHooksToSort; + void* gs_phOptionalHooks; + void* gs_phOptionalFunctions; +} APP_DATA; + #endif /* APR_H */ /** @} */ From patrick20@example.org Mon Dec 02 21:21:21 2002 Return-Path: <patrick20@example.org> Delivered-To: patrick20@example.org Received: (qmail 26198 invoked by uid 500); 2 Dec 2002 21:21:21 -0000 Mailing-List: contact patrick20@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:patrick20@example.org> List-Help: <mailto:patrick20@example.org> List-Unsubscribe: <mailto:patrick20@example.org> List-Subscribe: <mailto:patrick20@example.org> Reply-To: patrick20@example.org Delivered-To: mailing list patrick20@example.org Received: (qmail 26187 invoked by uid 500); 2 Dec 2002 21:21:21 -0000 Delivered-To: patrick20@example.org Date: 2 Dec 2002 21:21:20 -0000 Message-ID: <patrick20@example.org> From: patrick20@example.org To: patrick20@example.org Subject: cvs commit: apr-util/hooks apr_hooks.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N bnicholes 2002/12/02 13:21:20 Modified: hooks apr_hooks.c Log: Eliminating the per-application global data in the apr_hook source for NetWare. Static per-application global data in a library causes a problem on NetWare because a library NLM does not have application boundaries. All static data is global to all applications. Revision Changes Path 1.45 +34 -1 apr-util/hooks/apr_hooks.c Index: apr_hooks.c =================================================================== RCS file: /home/cvs/apr-util/hooks/apr_hooks.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- apr_hooks.c 8 Jul 2002 03:58:32 -0000 1.44 +++ apr_hooks.c 2 Dec 2002 21:21:20 -0000 1.45 @@ -102,6 +102,13 @@ struct tsort_ *pNext; } TSort; +#ifdef NETWARE +#define get_apd APP_DATA* apd = (APP_DATA*)get_app_data(gLibId); +#define s_aHooksToSort ((apr_array_header_t *)(apd->gs_aHooksToSort)) +#define s_phOptionalHooks ((apr_hash_t *)(apd->gs_phOptionalHooks)) +#define s_phOptionalFunctions ((apr_hash_t *)(apd->gs_phOptionalFunctions)) +#endif + static int crude_order(const void *a_,const void *b_) { const TSortData *a=a_; @@ -216,7 +223,10 @@ return pNew; } +#ifndef NETWARE static apr_array_header_t *s_aHooksToSort; +#endif + typedef struct { const char *szHookName; @@ -226,10 +236,13 @@ APU_DECLARE(void) apr_hook_sort_register(const char *szHookName, apr_array_header_t **paHooks) { +#ifdef NETWARE + get_apd +#endif HookSortEntry *pEntry; if(!s_aHooksToSort) - s_aHooksToSort=apr_array_make(apr_hook_global_pool,1,sizeof(HookSortEntry)); + s_aHooksToSort=apr_array_make(apr_hook_global_pool,1,sizeof(HookSortEntry)); pEntry=apr_array_push(s_aHooksToSort); pEntry->szHookName=szHookName; pEntry->paHooks=paHooks; @@ -237,6 +250,9 @@ APU_DECLARE(void) apr_hook_sort_all() { +#ifdef NETWARE + get_apd +#endif int n; for(n=0 ; n < s_aHooksToSort->nelts ; ++n) { @@ -251,11 +267,16 @@ apr_hook_sort_all(); } +#ifndef NETWARE static apr_hash_t *s_phOptionalHooks; static apr_hash_t *s_phOptionalFunctions; +#endif APU_DECLARE(void) apr_hook_deregister_all(void) { +#ifdef NETWARE + get_apd +#endif int n; for(n=0 ; n < s_aHooksToSort->nelts ; ++n) { @@ -314,6 +335,9 @@ APU_DECLARE(apr_array_header_t *) apr_optional_hook_get(const char *szName) { +#ifdef NETWARE + get_apd +#endif apr_array_header_t **ppArray; if(!s_phOptionalHooks) @@ -328,6 +352,9 @@ const char * const *aszPre, const char * const *aszSucc,int nOrder) { +#ifdef NETWARE + get_apd +#endif apr_array_header_t *pArray=apr_optional_hook_get(szName); apr_LINK__optional_t *pHook; @@ -357,6 +384,9 @@ APU_DECLARE(apr_opt_fn_t *) apr_dynamic_fn_retrieve(const char *szName) { +#ifdef NETWARE + get_apd +#endif if(!s_phOptionalFunctions) return NULL; return (void(*)(void))apr_hash_get(s_phOptionalFunctions,szName,strlen(szName)); @@ -371,6 +401,9 @@ APU_DECLARE_NONSTD(void) apr_dynamic_fn_register(const char *szName, apr_opt_fn_t *pfn) { +#ifdef NETWARE + get_apd +#endif if(!s_phOptionalFunctions) s_phOptionalFunctions=apr_hash_make(apr_hook_global_pool); apr_hash_set(s_phOptionalFunctions,szName,strlen(szName),(void *)pfn); From patrick20@example.org Mon Dec 02 22:09:33 2002 Return-Path: <patrick20@example.org> Delivered-To: patrick20@example.org Received: (qmail 61808 invoked by uid 500); 2 Dec 2002 22:09:33 -0000 Mailing-List: contact patrick20@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:patrick20@example.org> List-Help: <mailto:patrick20@example.org> List-Unsubscribe: <mailto:patrick20@example.org> List-Subscribe: <mailto:patrick20@example.org> Reply-To: patrick20@example.org Delivered-To: mailing list patrick20@example.org Received: (qmail 61797 invoked by uid 500); 2 Dec 2002 22:09:33 -0000 Delivered-To: patrick20@example.org Date: 2 Dec 2002 22:09:32 -0000 Message-ID: <patrick20@example.org> From: patrick20@example.org To: patrick20@example.org Subject: cvs commit: apr-iconv/build modules.mk.win X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N wrowe 2002/12/02 14:09:31 Modified: ccs Makefile.win ces Makefile.win build modules.mk.win Log: Give these build scripts a little tummy tuck, we don't need intermediate .lib/.exp files for loadable modules (nothing will ever link to them), nor do we need the /FD or /incremental .idb files. However, here's where precompilation *really* wins us big time. Since every modules includes simply iconv.h, these build quite quickly now. Revision Changes Path 1.2 +194 -194 apr-iconv/ccs/Makefile.win Index: Makefile.win =================================================================== RCS file: /home/cvs/apr-iconv/ccs/Makefile.win,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.win 12 Nov 2002 20:02:52 -0000 1.1 +++ Makefile.win 2 Dec 2002 22:09:+1-682-471-0228.2 @@ -1,197 +1,197 @@ ALL_TARGETS = \ - $(OUTPUT_DIR)/adobe-stdenc.so \ - $(OUTPUT_DIR)/adobe-symbol.so \ - $(OUTPUT_DIR)/adobe-zdingbats.so \ - $(OUTPUT_DIR)/big5.so \ - $(OUTPUT_DIR)/cns11643-plane1.so \ - $(OUTPUT_DIR)/cns11643-plane14.so \ - $(OUTPUT_DIR)/cns11643-plane2.so \ - $(OUTPUT_DIR)/cp037.so \ - $(OUTPUT_DIR)/cp038.so \ - $(OUTPUT_DIR)/cp10000.so \ - $(OUTPUT_DIR)/cp10006.so \ - $(OUTPUT_DIR)/cp10007.so \ - $(OUTPUT_DIR)/cp10029.so \ - $(OUTPUT_DIR)/cp1006.so \ - $(OUTPUT_DIR)/cp10079.so \ - $(OUTPUT_DIR)/cp10081.so \ - $(OUTPUT_DIR)/cp1026.so \ - $(OUTPUT_DIR)/cp273.so \ - $(OUTPUT_DIR)/cp274.so \ - $(OUTPUT_DIR)/cp275.so \ - $(OUTPUT_DIR)/cp277.so \ - $(OUTPUT_DIR)/cp278.so \ - $(OUTPUT_DIR)/cp280.so \ - $(OUTPUT_DIR)/cp281.so \ - $(OUTPUT_DIR)/cp284.so \ - $(OUTPUT_DIR)/cp285.so \ - $(OUTPUT_DIR)/cp290.so \ - $(OUTPUT_DIR)/cp297.so \ - $(OUTPUT_DIR)/cp420.so \ - $(OUTPUT_DIR)/cp423.so \ - $(OUTPUT_DIR)/cp424.so \ - $(OUTPUT_DIR)/cp437.so \ - $(OUTPUT_DIR)/cp500.so \ - $(OUTPUT_DIR)/cp737.so \ - $(OUTPUT_DIR)/cp775.so \ - $(OUTPUT_DIR)/cp850.so \ - $(OUTPUT_DIR)/cp851.so \ - $(OUTPUT_DIR)/cp852.so \ - $(OUTPUT_DIR)/cp855.so \ - $(OUTPUT_DIR)/cp856.so \ - $(OUTPUT_DIR)/cp857.so \ - $(OUTPUT_DIR)/cp860.so \ - $(OUTPUT_DIR)/cp861.so \ - $(OUTPUT_DIR)/cp862.so \ - $(OUTPUT_DIR)/cp863.so \ - $(OUTPUT_DIR)/cp864.so \ - $(OUTPUT_DIR)/cp865.so \ - $(OUTPUT_DIR)/cp866.so \ - $(OUTPUT_DIR)/cp868.so \ - $(OUTPUT_DIR)/cp869.so \ - $(OUTPUT_DIR)/cp870.so \ - $(OUTPUT_DIR)/cp871.so \ - $(OUTPUT_DIR)/cp874.so \ - $(OUTPUT_DIR)/cp875.so \ - $(OUTPUT_DIR)/cp880.so \ - $(OUTPUT_DIR)/cp891.so \ - $(OUTPUT_DIR)/cp903.so \ - $(OUTPUT_DIR)/cp904.so \ - $(OUTPUT_DIR)/cp905.so \ - $(OUTPUT_DIR)/cp918.so \ - $(OUTPUT_DIR)/cp932.so \ - $(OUTPUT_DIR)/cp936.so \ - $(OUTPUT_DIR)/cp949.so \ - $(OUTPUT_DIR)/cp950.so \ - $(OUTPUT_DIR)/dec-mcs.so \ - $(OUTPUT_DIR)/ebcdic-at-de-a.so \ - $(OUTPUT_DIR)/ebcdic-at-de.so \ - $(OUTPUT_DIR)/ebcdic-ca-fr.so \ - $(OUTPUT_DIR)/ebcdic-dk-no-a.so \ - $(OUTPUT_DIR)/ebcdic-dk-no.so \ - $(OUTPUT_DIR)/ebcdic-es-a.so \ - $(OUTPUT_DIR)/ebcdic-es-s.so \ - $(OUTPUT_DIR)/ebcdic-es.so \ - $(OUTPUT_DIR)/ebcdic-fi-se-a.so \ - $(OUTPUT_DIR)/ebcdic-fi-se.so \ - $(OUTPUT_DIR)/ebcdic-fr.so \ - $(OUTPUT_DIR)/ebcdic-it.so \ - $(OUTPUT_DIR)/ebcdic-pt.so \ - $(OUTPUT_DIR)/ebcdic-uk.so \ - $(OUTPUT_DIR)/ebcdic-us.so \ - $(OUTPUT_DIR)/gb12345.so \ - $(OUTPUT_DIR)/gb_2312-80.so \ - $(OUTPUT_DIR)/hp-roman8.so \ - $(OUTPUT_DIR)/iso-8859-1.so \ - $(OUTPUT_DIR)/iso-8859-10.so \ - $(OUTPUT_DIR)/iso-8859-13.so \ - $(OUTPUT_DIR)/iso-8859-14.so \ - $(OUTPUT_DIR)/iso-8859-15.so \ - $(OUTPUT_DIR)/iso-8859-2.so \ - $(OUTPUT_DIR)/iso-8859-3.so \ - $(OUTPUT_DIR)/iso-8859-4.so \ - $(OUTPUT_DIR)/iso-8859-5.so \ - $(OUTPUT_DIR)/iso-8859-6.so \ - $(OUTPUT_DIR)/iso-8859-7.so \ - $(OUTPUT_DIR)/iso-8859-8.so \ - $(OUTPUT_DIR)/iso-8859-9.so \ - $(OUTPUT_DIR)/iso-ir-10.so \ - $(OUTPUT_DIR)/iso-ir-102.so \ - $(OUTPUT_DIR)/iso-ir-103.so \ - $(OUTPUT_DIR)/iso-ir-11.so \ - $(OUTPUT_DIR)/iso-ir-111.so \ - $(OUTPUT_DIR)/iso-ir-121.so \ - $(OUTPUT_DIR)/iso-ir-122.so \ - $(OUTPUT_DIR)/iso-ir-123.so \ - $(OUTPUT_DIR)/iso-ir-128.so \ - $(OUTPUT_DIR)/iso-ir-13.so \ - $(OUTPUT_DIR)/iso-ir-139.so \ - $(OUTPUT_DIR)/iso-ir-14.so \ - $(OUTPUT_DIR)/iso-ir-141.so \ - $(OUTPUT_DIR)/iso-ir-142.so \ - $(OUTPUT_DIR)/iso-ir-143.so \ - $(OUTPUT_DIR)/iso-ir-146.so \ - $(OUTPUT_DIR)/iso-ir-147.so \ - $(OUTPUT_DIR)/iso-ir-15.so \ - $(OUTPUT_DIR)/iso-ir-150.so \ - $(OUTPUT_DIR)/iso-ir-151.so \ - $(OUTPUT_DIR)/iso-ir-152.so \ - $(OUTPUT_DIR)/iso-ir-153.so \ - $(OUTPUT_DIR)/iso-ir-154.so \ - $(OUTPUT_DIR)/iso-ir-155.so \ - $(OUTPUT_DIR)/iso-ir-158.so \ - $(OUTPUT_DIR)/iso-ir-16.so \ - $(OUTPUT_DIR)/iso-ir-17.so \ - $(OUTPUT_DIR)/iso-ir-18.so \ - $(OUTPUT_DIR)/iso-ir-19.so \ - $(OUTPUT_DIR)/iso-ir-2.so \ - $(OUTPUT_DIR)/iso-ir-21.so \ - $(OUTPUT_DIR)/iso-ir-25.so \ - $(OUTPUT_DIR)/iso-ir-27.so \ - $(OUTPUT_DIR)/iso-ir-37.so \ - $(OUTPUT_DIR)/iso-ir-4.so \ - $(OUTPUT_DIR)/iso-ir-47.so \ - $(OUTPUT_DIR)/iso-ir-49.so \ - $(OUTPUT_DIR)/iso-ir-50.so \ - $(OUTPUT_DIR)/iso-ir-51.so \ - $(OUTPUT_DIR)/iso-ir-54.so \ - $(OUTPUT_DIR)/iso-ir-55.so \ - $(OUTPUT_DIR)/iso-ir-57.so \ - $(OUTPUT_DIR)/iso-ir-60.so \ - $(OUTPUT_DIR)/iso-ir-61.so \ - $(OUTPUT_DIR)/iso-ir-69.so \ - $(OUTPUT_DIR)/iso-ir-70.so \ - $(OUTPUT_DIR)/iso-ir-8-1.so \ - $(OUTPUT_DIR)/iso-ir-8-2.so \ - $(OUTPUT_DIR)/iso-ir-84.so \ - $(OUTPUT_DIR)/iso-ir-85.so \ - $(OUTPUT_DIR)/iso-ir-86.so \ - $(OUTPUT_DIR)/iso-ir-88.so \ - $(OUTPUT_DIR)/iso-ir-89.so \ - $(OUTPUT_DIR)/iso-ir-9-1.so \ - $(OUTPUT_DIR)/iso-ir-9-2.so \ - $(OUTPUT_DIR)/iso-ir-90.so \ - $(OUTPUT_DIR)/iso-ir-91.so \ - $(OUTPUT_DIR)/iso-ir-92.so \ - $(OUTPUT_DIR)/iso-ir-93.so \ - $(OUTPUT_DIR)/iso-ir-94.so \ - $(OUTPUT_DIR)/iso-ir-95.so \ - $(OUTPUT_DIR)/iso-ir-96.so \ - $(OUTPUT_DIR)/iso-ir-98.so \ - $(OUTPUT_DIR)/iso-ir-99.so \ - $(OUTPUT_DIR)/iso646-dk.so \ - $(OUTPUT_DIR)/iso646-kr.so \ - $(OUTPUT_DIR)/jis_x0201.so \ - $(OUTPUT_DIR)/jis_x0208-1983.so \ - $(OUTPUT_DIR)/jis_x0212-1990.so \ - $(OUTPUT_DIR)/johab.so \ - $(OUTPUT_DIR)/koi8-r.so \ - $(OUTPUT_DIR)/koi8-ru.so \ - $(OUTPUT_DIR)/koi8-u.so \ - $(OUTPUT_DIR)/ksx1001.so \ - $(OUTPUT_DIR)/mac-ce.so \ - $(OUTPUT_DIR)/mac-croatian.so \ - $(OUTPUT_DIR)/mac-cyrillic.so \ - $(OUTPUT_DIR)/mac-dingbats.so \ - $(OUTPUT_DIR)/mac-greek.so \ - $(OUTPUT_DIR)/mac-iceland.so \ - $(OUTPUT_DIR)/mac-japan.so \ - $(OUTPUT_DIR)/mac-roman.so \ - $(OUTPUT_DIR)/mac-romania.so \ - $(OUTPUT_DIR)/mac-thai.so \ - $(OUTPUT_DIR)/mac-turkish.so \ - $(OUTPUT_DIR)/mac-ukraine.so \ - $(OUTPUT_DIR)/macintosh.so \ - $(OUTPUT_DIR)/shift_jis.so \ - $(OUTPUT_DIR)/us-ascii.so \ - $(OUTPUT_DIR)/windows-1250.so \ - $(OUTPUT_DIR)/windows-1251.so \ - $(OUTPUT_DIR)/windows-1252.so \ - $(OUTPUT_DIR)/windows-1253.so \ - $(OUTPUT_DIR)/windows-1254.so \ - $(OUTPUT_DIR)/windows-1255.so \ - $(OUTPUT_DIR)/windows-1256.so \ - $(OUTPUT_DIR)/windows-1257.so \ - $(OUTPUT_DIR)/windows-1258.so + $(OUTPUT_DIR)\adobe-stdenc.so \ + $(OUTPUT_DIR)\adobe-symbol.so \ + $(OUTPUT_DIR)\adobe-zdingbats.so \ + $(OUTPUT_DIR)\big5.so \ + $(OUTPUT_DIR)\cns11643-plane1.so \ + $(OUTPUT_DIR)\cns11643-plane14.so \ + $(OUTPUT_DIR)\cns11643-plane2.so \ + $(OUTPUT_DIR)\cp037.so \ + $(OUTPUT_DIR)\cp038.so \ + $(OUTPUT_DIR)\cp10000.so \ + $(OUTPUT_DIR)\cp10006.so \ + $(OUTPUT_DIR)\cp10007.so \ + $(OUTPUT_DIR)\cp10029.so \ + $(OUTPUT_DIR)\cp1006.so \ + $(OUTPUT_DIR)\cp10079.so \ + $(OUTPUT_DIR)\cp10081.so \ + $(OUTPUT_DIR)\cp1026.so \ + $(OUTPUT_DIR)\cp273.so \ + $(OUTPUT_DIR)\cp274.so \ + $(OUTPUT_DIR)\cp275.so \ + $(OUTPUT_DIR)\cp277.so \ + $(OUTPUT_DIR)\cp278.so \ + $(OUTPUT_DIR)\cp280.so \ + $(OUTPUT_DIR)\cp281.so \ + $(OUTPUT_DIR)\cp284.so \ + $(OUTPUT_DIR)\cp285.so \ + $(OUTPUT_DIR)\cp290.so \ + $(OUTPUT_DIR)\cp297.so \ + $(OUTPUT_DIR)\cp420.so \ + $(OUTPUT_DIR)\cp423.so \ + $(OUTPUT_DIR)\cp424.so \ + $(OUTPUT_DIR)\cp437.so \ + $(OUTPUT_DIR)\cp500.so \ + $(OUTPUT_DIR)\cp737.so \ + $(OUTPUT_DIR)\cp775.so \ + $(OUTPUT_DIR)\cp850.so \ + $(OUTPUT_DIR)\cp851.so \ + $(OUTPUT_DIR)\cp852.so \ + $(OUTPUT_DIR)\cp855.so \ + $(OUTPUT_DIR)\cp856.so \ + $(OUTPUT_DIR)\cp857.so \ + $(OUTPUT_DIR)\cp860.so \ + $(OUTPUT_DIR)\cp861.so \ + $(OUTPUT_DIR)\cp862.so \ + $(OUTPUT_DIR)\cp863.so \ + $(OUTPUT_DIR)\cp864.so \ + $(OUTPUT_DIR)\cp865.so \ + $(OUTPUT_DIR)\cp866.so \ + $(OUTPUT_DIR)\cp868.so \ + $(OUTPUT_DIR)\cp869.so \ + $(OUTPUT_DIR)\cp870.so \ + $(OUTPUT_DIR)\cp871.so \ + $(OUTPUT_DIR)\cp874.so \ + $(OUTPUT_DIR)\cp875.so \ + $(OUTPUT_DIR)\cp880.so \ + $(OUTPUT_DIR)\cp891.so \ + $(OUTPUT_DIR)\cp903.so \ + $(OUTPUT_DIR)\cp904.so \ + $(OUTPUT_DIR)\cp905.so \ + $(OUTPUT_DIR)\cp918.so \ + $(OUTPUT_DIR)\cp932.so \ + $(OUTPUT_DIR)\cp936.so \ + $(OUTPUT_DIR)\cp949.so \ + $(OUTPUT_DIR)\cp950.so \ + $(OUTPUT_DIR)\dec-mcs.so \ + $(OUTPUT_DIR)\ebcdic-at-de-a.so \ + $(OUTPUT_DIR)\ebcdic-at-de.so \ + $(OUTPUT_DIR)\ebcdic-ca-fr.so \ + $(OUTPUT_DIR)\ebcdic-dk-no-a.so \ + $(OUTPUT_DIR)\ebcdic-dk-no.so \ + $(OUTPUT_DIR)\ebcdic-es-a.so \ + $(OUTPUT_DIR)\ebcdic-es-s.so \ + $(OUTPUT_DIR)\ebcdic-es.so \ + $(OUTPUT_DIR)\ebcdic-fi-se-a.so \ + $(OUTPUT_DIR)\ebcdic-fi-se.so \ + $(OUTPUT_DIR)\ebcdic-fr.so \ + $(OUTPUT_DIR)\ebcdic-it.so \ + $(OUTPUT_DIR)\ebcdic-pt.so \ + $(OUTPUT_DIR)\ebcdic-uk.so \ + $(OUTPUT_DIR)\ebcdic-us.so \ + $(OUTPUT_DIR)\gb12345.so \ + $(OUTPUT_DIR)\gb_2312-80.so \ + $(OUTPUT_DIR)\hp-roman8.so \ + $(OUTPUT_DIR)\iso-8859-1.so \ + $(OUTPUT_DIR)\iso-8859-10.so \ + $(OUTPUT_DIR)\iso-8859-13.so \ + $(OUTPUT_DIR)\iso-8859-14.so \ + $(OUTPUT_DIR)\iso-8859-15.so \ + $(OUTPUT_DIR)\iso-8859-2.so \ + $(OUTPUT_DIR)\iso-8859-3.so \ + $(OUTPUT_DIR)\iso-8859-4.so \ + $(OUTPUT_DIR)\iso-8859-5.so \ + $(OUTPUT_DIR)\iso-8859-6.so \ + $(OUTPUT_DIR)\iso-8859-7.so \ + $(OUTPUT_DIR)\iso-8859-8.so \ + $(OUTPUT_DIR)\iso-8859-9.so \ + $(OUTPUT_DIR)\iso-ir-10.so \ + $(OUTPUT_DIR)\iso-ir-102.so \ + $(OUTPUT_DIR)\iso-ir-103.so \ + $(OUTPUT_DIR)\iso-ir-11.so \ + $(OUTPUT_DIR)\iso-ir-111.so \ + $(OUTPUT_DIR)\iso-ir-121.so \ + $(OUTPUT_DIR)\iso-ir-122.so \ + $(OUTPUT_DIR)\iso-ir-123.so \ + $(OUTPUT_DIR)\iso-ir-128.so \ + $(OUTPUT_DIR)\iso-ir-13.so \ + $(OUTPUT_DIR)\iso-ir-139.so \ + $(OUTPUT_DIR)\iso-ir-14.so \ + $(OUTPUT_DIR)\iso-ir-141.so \ + $(OUTPUT_DIR)\iso-ir-142.so \ + $(OUTPUT_DIR)\iso-ir-143.so \ + $(OUTPUT_DIR)\iso-ir-146.so \ + $(OUTPUT_DIR)\iso-ir-147.so \ + $(OUTPUT_DIR)\iso-ir-15.so \ + $(OUTPUT_DIR)\iso-ir-150.so \ + $(OUTPUT_DIR)\iso-ir-151.so \ + $(OUTPUT_DIR)\iso-ir-152.so \ + $(OUTPUT_DIR)\iso-ir-153.so \ + $(OUTPUT_DIR)\iso-ir-154.so \ + $(OUTPUT_DIR)\iso-ir-155.so \ + $(OUTPUT_DIR)\iso-ir-158.so \ + $(OUTPUT_DIR)\iso-ir-16.so \ + $(OUTPUT_DIR)\iso-ir-17.so \ + $(OUTPUT_DIR)\iso-ir-18.so \ + $(OUTPUT_DIR)\iso-ir-19.so \ + $(OUTPUT_DIR)\iso-ir-2.so \ + $(OUTPUT_DIR)\iso-ir-21.so \ + $(OUTPUT_DIR)\iso-ir-25.so \ + $(OUTPUT_DIR)\iso-ir-27.so \ + $(OUTPUT_DIR)\iso-ir-37.so \ + $(OUTPUT_DIR)\iso-ir-4.so \ + $(OUTPUT_DIR)\iso-ir-47.so \ + $(OUTPUT_DIR)\iso-ir-49.so \ + $(OUTPUT_DIR)\iso-ir-50.so \ + $(OUTPUT_DIR)\iso-ir-51.so \ + $(OUTPUT_DIR)\iso-ir-54.so \ + $(OUTPUT_DIR)\iso-ir-55.so \ + $(OUTPUT_DIR)\iso-ir-57.so \ + $(OUTPUT_DIR)\iso-ir-60.so \ + $(OUTPUT_DIR)\iso-ir-61.so \ + $(OUTPUT_DIR)\iso-ir-69.so \ + $(OUTPUT_DIR)\iso-ir-70.so \ + $(OUTPUT_DIR)\iso-ir-8-1.so \ + $(OUTPUT_DIR)\iso-ir-8-2.so \ + $(OUTPUT_DIR)\iso-ir-84.so \ + $(OUTPUT_DIR)\iso-ir-85.so \ + $(OUTPUT_DIR)\iso-ir-86.so \ + $(OUTPUT_DIR)\iso-ir-88.so \ + $(OUTPUT_DIR)\iso-ir-89.so \ + $(OUTPUT_DIR)\iso-ir-9-1.so \ + $(OUTPUT_DIR)\iso-ir-9-2.so \ + $(OUTPUT_DIR)\iso-ir-90.so \ + $(OUTPUT_DIR)\iso-ir-91.so \ + $(OUTPUT_DIR)\iso-ir-92.so \ + $(OUTPUT_DIR)\iso-ir-93.so \ + $(OUTPUT_DIR)\iso-ir-94.so \ + $(OUTPUT_DIR)\iso-ir-95.so \ + $(OUTPUT_DIR)\iso-ir-96.so \ + $(OUTPUT_DIR)\iso-ir-98.so \ + $(OUTPUT_DIR)\iso-ir-99.so \ + $(OUTPUT_DIR)\iso646-dk.so \ + $(OUTPUT_DIR)\iso646-kr.so \ + $(OUTPUT_DIR)\jis_x0201.so \ + $(OUTPUT_DIR)\jis_x0208-1983.so \ + $(OUTPUT_DIR)\jis_x0212-1990.so \ + $(OUTPUT_DIR)\johab.so \ + $(OUTPUT_DIR)\koi8-r.so \ + $(OUTPUT_DIR)\koi8-ru.so \ + $(OUTPUT_DIR)\koi8-u.so \ + $(OUTPUT_DIR)\ksx1001.so \ + $(OUTPUT_DIR)\mac-ce.so \ + $(OUTPUT_DIR)\mac-croatian.so \ + $(OUTPUT_DIR)\mac-cyrillic.so \ + $(OUTPUT_DIR)\mac-dingbats.so \ + $(OUTPUT_DIR)\mac-greek.so \ + $(OUTPUT_DIR)\mac-iceland.so \ + $(OUTPUT_DIR)\mac-japan.so \ + $(OUTPUT_DIR)\mac-roman.so \ + $(OUTPUT_DIR)\mac-romania.so \ + $(OUTPUT_DIR)\mac-thai.so \ + $(OUTPUT_DIR)\mac-turkish.so \ + $(OUTPUT_DIR)\mac-ukraine.so \ + $(OUTPUT_DIR)\macintosh.so \ + $(OUTPUT_DIR)\shift_jis.so \ + $(OUTPUT_DIR)\us-ascii.so \ + $(OUTPUT_DIR)\windows-1250.so \ + $(OUTPUT_DIR)\windows-1251.so \ + $(OUTPUT_DIR)\windows-1252.so \ + $(OUTPUT_DIR)\windows-1253.so \ + $(OUTPUT_DIR)\windows-1254.so \ + $(OUTPUT_DIR)\windows-1255.so \ + $(OUTPUT_DIR)\windows-1256.so \ + $(OUTPUT_DIR)\windows-1257.so \ + $(OUTPUT_DIR)\windows-1258.so !INCLUDE ../build/modules.mk.win 1.2 +16 -16 apr-iconv/ces/Makefile.win Index: Makefile.win =================================================================== RCS file: /home/cvs/apr-iconv/ces/Makefile.win,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.win 12 Nov 2002 20:02:52 -0000 1.1 +++ Makefile.win 2 Dec 2002 22:09:+1-682-471-0228.2 @@ -1,19 +1,19 @@ ALL_TARGETS = \ - $(OUTPUT_DIR)/_tbl_simple.so \ - $(OUTPUT_DIR)/euc-jp.so \ - $(OUTPUT_DIR)/euc-kr.so \ - $(OUTPUT_DIR)/euc-tw.so \ - $(OUTPUT_DIR)/gb2312.so \ - $(OUTPUT_DIR)/iso-10646-ucs-2.so \ - $(OUTPUT_DIR)/iso-10646-ucs-4.so \ - $(OUTPUT_DIR)/iso-2022-cn.so \ - $(OUTPUT_DIR)/iso-2022-jp-2.so \ - $(OUTPUT_DIR)/iso-2022-jp.so \ - $(OUTPUT_DIR)/iso-2022-kr.so \ - $(OUTPUT_DIR)/ucs2-internal.so \ - $(OUTPUT_DIR)/ucs4-internal.so \ - $(OUTPUT_DIR)/unicode-1-1-utf-7.so \ - $(OUTPUT_DIR)/utf-16.so \ - $(OUTPUT_DIR)/utf-8.so + $(OUTPUT_DIR)\_tbl_simple.so \ + $(OUTPUT_DIR)\euc-jp.so \ + $(OUTPUT_DIR)\euc-kr.so \ + $(OUTPUT_DIR)\euc-tw.so \ + $(OUTPUT_DIR)\gb2312.so \ + $(OUTPUT_DIR)\iso-10646-ucs-2.so \ + $(OUTPUT_DIR)\iso-10646-ucs-4.so \ + $(OUTPUT_DIR)\iso-2022-cn.so \ + $(OUTPUT_DIR)\iso-2022-jp-2.so \ + $(OUTPUT_DIR)\iso-2022-jp.so \ + $(OUTPUT_DIR)\iso-2022-kr.so \ + $(OUTPUT_DIR)\ucs2-internal.so \ + $(OUTPUT_DIR)\ucs4-internal.so \ + $(OUTPUT_DIR)\unicode-1-1-utf-7.so \ + $(OUTPUT_DIR)\utf-16.so \ + $(OUTPUT_DIR)\utf-8.so !INCLUDE ../build/modules.mk.win 1.2 +37 -32 apr-iconv/build/modules.mk.win Index: modules.mk.win =================================================================== RCS file: /home/cvs/apr-iconv/build/modules.mk.win,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- modules.mk.win 12 Nov 2002 20:02:52 -0000 1.1 +++ modules.mk.win 2 Dec 2002 22:09:+1-682-471-0228.2 @@ -8,26 +8,8 @@ SILENT=@ # Default build type: Release, static APR, static APR-iconv -BUILD_TYPE = RSS +BUILD_TYPE = RDD -!IF "$(BUILD_TYPE)" == "RSS" -# Release: static APR, static APR-iconv -APR_LIB_PFX = LibR/ -API_LIB_PFX = LibR/ -INT_CFLAGS = /MD /O2 -INT_DEFINES = /D "NDEBUG" /D "APR_DECLARE_STATIC" -OUTPUT_DIR = LibR - -!ELSE -!IF "$(BUILD_TYPE)" == "DSS" -# Debug: static APR, static APR-iconv -APR_LIB_PFX = LibD/ -API_LIB_PFX = LibD/ -INT_CFLAGS = /MDd /ZI /Od -INT_DEFINES = /D "_DEBUG" /D "APR_DECLARE_STATIC" -OUTPUT_DIR = LibD - -!ELSE !IF "$(BUILD_TYPE)" == "RDD" # Release: dynamic APR, dynamic APR-iconv APR_LIB_PFX = Release/lib @@ -38,20 +20,39 @@ !ELSE !IF "$(BUILD_TYPE)" == "DDD" -# Debug: dynamic APR, cynamic APR-iconv +# Debug: dynamic APR, dynamic APR-iconv APR_LIB_PFX = Debug/lib API_LIB_PFX = Debug/lib -INT_CFLAGS = /MDd /ZI /Od +INT_CFLAGS = /MDd /Zi /Od INT_DEFINES = /D "_DEBUG" +INT_LDFLAGS = /DEBUG OUTPUT_DIR = Debug !ELSE +!IF "$(BUILD_TYPE)" == "RSS" +# Release: static APR, static APR-iconv +APR_LIB_PFX = LibR/ +API_LIB_PFX = LibR/ +INT_CFLAGS = /MD /O2 +INT_DEFINES = /D "NDEBUG" /D "APR_DECLARE_STATIC" +OUTPUT_DIR = LibR + +!ELSE +!IF "$(BUILD_TYPE)" == "DSS" +# Debug: static APR, static APR-iconv +APR_LIB_PFX = LibD/ +API_LIB_PFX = LibD/ +INT_CFLAGS = /MDd /Zi /Od +INT_DEFINES = /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "API_DECLARE_STATIC" +OUTPUT_DIR = LibD + +!ELSE !IF "$(BUILD_TYPE)" == "RDS" # Release: dynamic APR, static APR-iconv APR_LIB_PFX = Release/lib API_LIB_PFX = DynLibR/ INT_CFLAGS = /MD /O2 -INT_DEFINES = /D "NDEBUG" +INT_DEFINES = /D "NDEBUG" /D "API_DECLARE_STATIC" OUTPUT_DIR = DynLibR !ELSE @@ -59,12 +60,12 @@ # Debug: dynamic APR, static APR-iconv APR_LIB_PFX = Debug/lib API_LIB_PFX = DynLibD/ -INT_CFLAGS = /MDd /ZI /Od -INT_DEFINES = /D "_DEBUG" +INT_CFLAGS = /MDd /Zi /Od +INT_DEFINES = /D "_DEBUG" /D "API_DECLARE_STATIC" OUTPUT_DIR = DynLibD !ELSE -wups, unknown build type! +!ERROR Wups, unknown build type! !ENDIF !ENDIF @@ -75,10 +76,10 @@ APR_SOURCE = ../../apr -INT_CFLAGS = /nologo /GX /FD $(INT_CFLAGS) +INT_CFLAGS = /nologo $(INT_CFLAGS) /Fp"$(OUTPUT_DIR)/iconv.pch" /YX"iconv.h" INT_INCLUDES = /I ../lib /I $(APR_SOURCE)/include INT_DEFINES = /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" $(INT_DEFINES) -INT_LDFLAGS = /nologo /dll /subsystem:windows /export:iconv_module,DATA +INT_LDFLAGS = /nologo /dll /incremental:no /subsystem:windows /export:iconv_module,DATA CFLAGS = /W3 ALL_CFLAGS = $(INT_CFLAGS) $(INT_INCLUDES) $(INT_DEFINES) $(CFLAGS) @@ -86,13 +87,17 @@ LDFLAGS = /WARN:0 ALL_LDFLAGS = $(INT_LDFLAGS) $(LDFLAGS) - .c{$(OUTPUT_DIR)}.so: -$(SILENT)if not exist "$(OUTPUT_DIR)/$(NULL)" mkdir "$(OUTPUT_DIR)" - $(SILENT)cl $(ALL_CFLAGS) /Fo$*.obj $< \ - /link $(ALL_LDFLAGS) /out:$@ \ - ../$(API_LIB_PFX)apriconv.lib $(APR_SOURCE)/$(APR_LIB_PFX)apr.lib \ - kernel32.lib advapi32.lib ws2_32.lib mswsock.lib + $(SILENT)echo Compiling and linking $@... + $(SILENT)cl $(ALL_CFLAGS) /Fo"$*.obj" /Fd"$*" $< \ + /link $(ALL_LDFLAGS) /out:$@ \ + ../$(API_LIB_PFX)apriconv.lib \ + $(APR_SOURCE)/$(APR_LIB_PFX)apr.lib \ + kernel32.lib advapi32.lib ws2_32.lib mswsock.lib + $(SILENT)echo. + $(SILENT)del "$*.exp" + $(SILENT)del "$*.lib" all: $(ALL_TARGETS) From patrick20@example.org Mon Dec 02 22:38:49 2002 Return-Path: <patrick20@example.org> Delivered-To: patrick20@example.org Received: (qmail 80289 invoked by uid 500); 2 Dec 2002 22:38:48 -0000 Mailing-List: contact patrick20@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:patrick20@example.org> List-Help: <mailto:patrick20@example.org> List-Unsubscribe: <mailto:patrick20@example.org> List-Subscribe: <mailto:patrick20@example.org> Reply-To: patrick20@example.org Delivered-To: mailing list patrick20@example.org Received: (qmail 80276 invoked by uid 500); 2 Dec 2002 22:38:48 -0000 Delivered-To: patrick20@example.org Date: 2 Dec 2002 22:38:47 -0000 Message-ID: <patrick20@example.org> From: patrick20@example.org To: patrick20@example.org Subject: cvs commit: apr-iconv/lib iconv.h iconv_ccs.c iconv_ces.c iconv_ces_euc.c iconv_ces_iso2022.c iconv_module.c iconv_uc.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N wrowe 2002/12/02 14:38:47 Modified: include apr_iconv.h lib iconv.h iconv_ccs.c iconv_ces.c iconv_ces_euc.c iconv_ces_iso2022.c iconv_module.c iconv_uc.c Log: * apr_ Namespace decoratation for all exported symbols so we might begin to coexist with a true iconv [especially if compiled into the clib.] * Provide API_DECLARE... wrappers around all exports for Win32. * Eliminate 'internals' from the public apr_iconv.h header. Revision Changes Path 1.2 +24 -306 apr-iconv/include/apr_iconv.h Index: apr_iconv.h =================================================================== RCS file: /home/cvs/apr-iconv/include/apr_iconv.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apr_iconv.h 20 Jul 2002 22:28:18 -0000 1.1 +++ apr_iconv.h 2 Dec 2002 22:38:47 -0000 1.2 @@ -47,44 +47,54 @@ /* apr additions */ /** - * APR_DECLARE_EXPORT is defined when building the APR dynamic library, - * so that all public symbols are exported. + * API_DECLARE_EXPORT is defined when building the libapriconv dynamic + * library, so that all public symbols are exported. * - * APR_DECLARE_STATIC is defined when including the APR public headers, + * API_DECLARE_STATIC is defined when including the apriconv 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. + * API_DECLARE_STATIC and API_DECLARE_EXPORT are left undefined when + * including the apr-iconv public headers, to import and link the symbols + * from the dynamic libapriconv 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(). + * The public apr-iconv functions are declared with API_DECLARE(), so they + * use the most portable calling convention. Public apr-iconv functions + * with variable arguments must use API_DECLARE_NONSTD(). * - * @deffunc APR_DECLARE(rettype) apr_func(args); + * @deffunc API_DECLARE(rettype) apr_func(args); */ #define API_DECLARE(type) type /** - * The public APR variables are declared with AP_MODULE_DECLARE_DATA. + * The private apr-iconv functions are declared with API_DECLARE_NONSTD(), + * so they use the most optimal C language calling conventions. + * + * @deffunc API_DECLARE(rettype) apr_func(args); + */ +#define API_DECLARE_NONSTD(type) type +/** + * All exported apr-iconv variables are declared with API_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 + * @deffunc API_DECLARE_DATA type apr_variable; + * @tip extern API_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_NONSTD(type) type #define API_DECLARE_DATA #elif defined(API_DECLARE_EXPORT) #define API_DECLARE(type) __declspec(dllexport) type __stdcall +#define API_DECLARE_NONSTD(type) __declspec(dllexport) type #define API_DECLARE_DATA __declspec(dllexport) #else #define API_DECLARE(type) __declspec(dllimport) type __stdcall +#define API_DECLARE_NONSTD(type) __declspec(dllimport) type #define API_DECLARE_DATA __declspec(dllimport) #endif @@ -100,297 +110,5 @@ API_DECLARE(apr_status_t) apr_iconv_close(iconv_t, apr_pool_t *); /* __END_DECLS */ - - -#ifdef ICONV_INTERNAL - -/* - * iconv module types - */ -#define ICMOD_ANY 0 -#define ICMOD_LIB 1 -#define ICMOD_UC_CCS 0x100 /* UC - CCS for CES */ -#define ICMOD_UC_CES 0x101 /* UC - CES */ - -/* - * iconv module flags - */ -#define ICMODF_LOADED 0x8000 - -/* - * iconv module handler events - */ -#define ICMODEV_LOAD 1 /* module load. after dependencies resolved */ -#define ICMODEV_UNLOAD 2 /* module unload */ -#define ICMODEV_DYNDEPS 3 /* load dynamic dependencies */ - -struct iconv_module_depend { - int md_type; - const char * md_name; - const void * md_data; -}; - -struct iconv_module; - -/* _tbl_simple.c table_load_ccs() calls iconv_mod_load(...ctx) */ - -typedef int iconv_mod_event_t(struct iconv_module *, int, apr_pool_t *ctx); - -struct iconv_module_desc { - int imd_type; - iconv_mod_event_t *imd_event; - const struct iconv_module_depend *imd_depend; - const void * imd_data; -}; - -#define ICONV_MODULE(type,data) struct iconv_module_desc iconv_module \ - {(type), (data)} - -struct iconv_module { - int im_flags; - void * im_handle; - struct iconv_module_desc *im_desc; - struct iconv_module *im_next; - struct iconv_module *im_deplist; - int im_depcnt; - const void * im_methods; - void * im_data; - const void * im_depdata; /* data if module loaded from dependency */ - const void * im_args; -}; - -#define ICONV_MOD_LOAD(mod,ctx) (mod)->im_desc->imd_event(mod, ICMODEV_LOAD,ctx) -#define ICONV_MOD_UNLOAD(mod,ctx) (mod)->im_desc->imd_event(mod, ICMODEV_UNLOAD,ctx) -#define ICONV_MOD_DYNDEPS(mod,ctx) (mod)->im_desc->imd_event(mod, ICMODEV_DYNDEPS,ctx) - -/* - * iconv converter definitions. - */ -typedef int iconv_open_t(const char *, const char *, void **, apr_pool_t *); -typedef int iconv_close_t(void *, apr_pool_t *); -typedef apr_status_t iconv_conv_t(void *, const unsigned char **, apr_size_t *, - unsigned char **, apr_size_t *, apr_size_t *); - -struct iconv_converter_desc { - iconv_open_t * icd_open; - iconv_close_t * icd_close; - iconv_conv_t * icd_conv; -}; - -struct iconv_converter { - struct iconv_converter_desc *ic_desc; - void * ic_data; -}; - -/* - * internal data types and functions used by charset conversion modules - */ - -#define UCS_CHAR_ZERO_WIDTH_NBSP 0xFEFF -#define UCS_CHAR_INVALID 0xFFFE -#define UCS_CHAR_NONE 0xFFFF - -typedef apr_uint16_t ucs2_t; /* Unicode character [D5] */ -typedef apr_uint32_t ucs4_t; /* Unicode scalar character [D28] */ -#define ucs_t ucs4_t - -/* - * one-level coded character set conversion tables - */ -typedef struct { - apr_uint16_t data[128]; -} iconv_ccs_convtable_7bit; /* 7-bit charset to Unicode */ - -typedef struct { - apr_uint16_t data[256]; -} iconv_ccs_convtable_8bit; /* 8-bit charset to Unicode */ - -/* - * two-level coded character set conversion tables - */ -typedef struct { - const iconv_ccs_convtable_7bit *data[128]; -} iconv_ccs_convtable_14bit; /* 14-bit charset to Unicode */ - -typedef struct { - const iconv_ccs_convtable_8bit *data[256]; -} iconv_ccs_convtable_16bit; /* 16-bit charset to Unicode; - * Unicode to any charset */ - -/* - * abstract coded character set conversion table - */ -typedef union { - iconv_ccs_convtable_7bit _7bit; - iconv_ccs_convtable_8bit _8bit; - iconv_ccs_convtable_14bit _14bit; - iconv_ccs_convtable_16bit _16bit; -} iconv_ccs_convtable; - -/* - * function for table-driven conversion - */ -typedef ucs2_t iconv_ccs_converter_t (ucs2_t ch); - -/* - * charset conversion module descriptor - */ -struct iconv_ccs_desc { - const char * const * names; - int nbits; - const iconv_ccs_convtable * from_ucs; - const iconv_ccs_convtable * to_ucs; - iconv_ccs_converter_t * convert_from_ucs; - iconv_ccs_converter_t * convert_to_ucs; -}; - -/* - * inline functions for use in charset conversion modules - */ -static APR_INLINE ucs2_t -iconv_ccs_convert_7bit(const iconv_ccs_convtable *table, ucs2_t ch) -{ - return ch & 0x80 ? UCS_CHAR_INVALID : table->_7bit.data[ch]; -} - -static APR_INLINE ucs2_t -iconv_ccs_convert_8bit(const iconv_ccs_convtable *table, ucs2_t ch) -{ - return table->_8bit.data[ch]; -} - -static APR_INLINE ucs2_t -iconv_ccs_convert_14bit(const iconv_ccs_convtable *table, ucs2_t ch) -{ - const iconv_ccs_convtable_7bit *sub_table; - - sub_table = ch & 0x8080 ? NULL : table->_14bit.data[ch >> 8]; - return sub_table ? sub_table->data[ch & 0x7F] : UCS_CHAR_INVALID; -} - -static APR_INLINE ucs2_t -iconv_ccs_convert_16bit(const iconv_ccs_convtable *table, ucs2_t ch) -{ - const iconv_ccs_convtable_8bit *sub_table; - - sub_table = table->_16bit.data[ch >> 8]; - return sub_table ? sub_table->data[ch & 0xFF] : UCS_CHAR_INVALID; -} - -#define ICONV_CCS_CONVERT_FROM_UCS(ccsd, ch) \ - ((ccsd)->convert_from_ucs(ch)) -#define ICONV_CCS_CONVERT_TO_UCS(ccsd, ch) \ - ((ccsd)->convert_to_ucs(ch)) - -/* - * generic character encoding schemes and functions - */ -struct iconv_ces; - -typedef int iconv_ces_open_t(struct iconv_ces *, apr_pool_t *); -typedef int iconv_ces_close_t(struct iconv_ces *); -typedef void iconv_ces_reset_t(struct iconv_ces *); -typedef const char * const *iconv_ces_names_t(struct iconv_ces *); -typedef int iconv_ces_nbits_t(struct iconv_ces *); -typedef int iconv_ces_nbytes_t(struct iconv_ces *); - -typedef apr_ssize_t iconv_ces_convert_from_ucs_t - (struct iconv_ces *data, ucs_t in, - unsigned char **outbuf, apr_size_t *outbytesleft); - -typedef ucs_t iconv_ces_convert_to_ucs_t - (struct iconv_ces *data, - const unsigned char **inbuf, apr_size_t *inbytesleft); - -struct iconv_ces_desc { - iconv_ces_open_t * open; - iconv_ces_close_t * close; - iconv_ces_reset_t * reset; - iconv_ces_names_t * names; - iconv_ces_nbits_t * nbits; - iconv_ces_nbytes_t * nbytes; - iconv_ces_convert_from_ucs_t * convert_from_ucs; - iconv_ces_convert_to_ucs_t * convert_to_ucs; - const void *data; -}; - -struct iconv_ces { - struct iconv_ces_desc * desc; - void * data; - struct iconv_module * mod; -}; - -int iconv_ces_open(const char *ces_name, struct iconv_ces **cespp, apr_pool_t *ctx); -int iconv_ces_close(struct iconv_ces *ces, apr_pool_t *ctx); -int iconv_ces_open_func(struct iconv_ces *ces); -int iconv_ces_close_func(struct iconv_ces *ces); -void iconv_ces_reset_func(struct iconv_ces *ces); -void iconv_ces_no_func(struct iconv_ces *ces); -int iconv_ces_nbits7(struct iconv_ces *ces); -int iconv_ces_nbits8(struct iconv_ces *ces); -int iconv_ces_zero(struct iconv_ces *ces); - -#define iconv_char32bit(ch) ((ch) & 0xFFFF0000) - -#define ICONV_CES_OPEN(ces,ctx) (ces)->desc->open(ces,ctx) -#define ICONV_CES_CLOSE(ces) (ces)->desc->close(ces) -#define ICONV_CES_RESET(ces) (ces)->desc->reset(ces) -#define ICONV_CES_CONVERT_FROM_UCS(cesd, in, outbuf, outbytes) \ - ((cesd)->desc->convert_from_ucs((cesd), (in), (outbuf), (outbytes))) -#define ICONV_CES_CONVERT_TO_UCS(cesd, inbuf, inbytes) \ - ((cesd)->desc->convert_to_ucs((cesd), (inbuf), (inbytes))) - -#define ICONV_CES_DRIVER_DECL(name) \ - iconv_ces_open_t iconv_##name##_open; \ - iconv_ces_close_t iconv_##name##_close; \ - iconv_ces_reset_t iconv_##name##_reset; \ - iconv_ces_nbits_t iconv_##name##_nbits; \ - iconv_ces_convert_from_ucs_t iconv_##name##_convert_from_ucs; \ - iconv_ces_convert_to_ucs_t iconv_##name##_convert_to_ucs - -/* - ************************************************ - * EUC character encoding schemes and functions * - ************************************************ - */ - -typedef struct iconv_ces_euc_ccs { - const char *prefix; - apr_size_t prefixlen; -} iconv_ces_euc_ccs_t; - -ICONV_CES_DRIVER_DECL(euc); - -/* - * ISO-2022 character encoding schemes and functions - */ -enum { ICONV_SHIFT_SI = 0, ICONV_SHIFT_SO, ICONV_SHIFT_SS2, ICONV_SHIFT_SS3 }; - -typedef struct iconv_ces_iso2022_ccs { - int shift; - const char * designator; - apr_size_t designatorlen; -} iconv_ces_iso2022_ccs_t; - -typedef struct { - const int * shift_tab; - int nccs; - const struct iconv_ces_iso2022_ccs *ccs; -} iconv_ces_iso2022_data; - -ICONV_CES_DRIVER_DECL(iso2022); - - -int iconv_mod_load(const char *, int, const void *, struct iconv_module **, apr_pool_t *); -int iconv_mod_unload(struct iconv_module *,apr_pool_t *ctx); -iconv_mod_event_t iconv_mod_noevent; - -iconv_mod_event_t iconv_ccs_event; - -int iconv_malloc(apr_size_t size, void **pp); - -extern struct iconv_converter_desc iconv_uc_desc; - -#endif /* ICONV_INTERNAL */ #endif /* _ICONV_H_ */ 1.11 +57 -29 apr-iconv/lib/iconv.h Index: iconv.h =================================================================== RCS file: /home/cvs/apr-iconv/lib/iconv.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- iconv.h 26 Jul 2001 23:12:59 -0000 1.10 +++ iconv.h 2 Dec 2002 22:38:47 -0000 1.11 @@ -47,44 +47,54 @@ /* apr additions */ /** - * APR_DECLARE_EXPORT is defined when building the APR dynamic library, - * so that all public symbols are exported. + * API_DECLARE_EXPORT is defined when building the libapriconv dynamic + * library, so that all public symbols are exported. * - * APR_DECLARE_STATIC is defined when including the APR public headers, + * API_DECLARE_STATIC is defined when including the apriconv 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. + * API_DECLARE_STATIC and API_DECLARE_EXPORT are left undefined when + * including the apr-iconv public headers, to import and link the symbols + * from the dynamic libapriconv 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(). + * The public apr-iconv functions are declared with API_DECLARE(), so they + * use the most portable calling convention. Public apr-iconv functions + * with variable arguments must use API_DECLARE_NONSTD(). * - * @deffunc APR_DECLARE(rettype) apr_func(args); + * @deffunc API_DECLARE(rettype) apr_func(args); */ #define API_DECLARE(type) type /** - * The public APR variables are declared with AP_MODULE_DECLARE_DATA. + * The private apr-iconv functions are declared with API_DECLARE_NONSTD(), + * so they use the most optimal C language calling conventions. + * + * @deffunc API_DECLARE(rettype) apr_func(args); + */ +#define API_DECLARE_NONSTD(type) type +/** + * All exported apr-iconv variables are declared with API_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 + * @deffunc API_DECLARE_DATA type apr_variable; + * @tip extern API_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_NONSTD(type) type #define API_DECLARE_DATA #elif defined(API_DECLARE_EXPORT) #define API_DECLARE(type) __declspec(dllexport) type __stdcall +#define API_DECLARE_NONSTD(type) __declspec(dllexport) type #define API_DECLARE_DATA __declspec(dllexport) #else #define API_DECLARE(type) __declspec(dllimport) type __stdcall +#define API_DECLARE_NONSTD(type) __declspec(dllimport) type #define API_DECLARE_DATA __declspec(dllimport) #endif @@ -132,7 +142,7 @@ struct iconv_module; -/* _tbl_simple.c table_load_ccs() calls iconv_mod_load(...ctx) */ +/* _tbl_simple.c table_load_ccs() calls apr_iconv_mod_load(...ctx) */ typedef int iconv_mod_event_t(struct iconv_module *, int, apr_pool_t *ctx); @@ -143,6 +153,8 @@ const void * imd_data; }; +#define END_ICONV_MODULE_DEPEND {0, NULL, NULL} + #define ICONV_MODULE(type,data) struct iconv_module_desc iconv_module \ {(type), (data)} @@ -320,15 +332,20 @@ struct iconv_module * mod; }; -int iconv_ces_open(const char *ces_name, struct iconv_ces **cespp, apr_pool_t *ctx); -int iconv_ces_close(struct iconv_ces *ces, apr_pool_t *ctx); -int iconv_ces_open_func(struct iconv_ces *ces); -int iconv_ces_close_func(struct iconv_ces *ces); -void iconv_ces_reset_func(struct iconv_ces *ces); -void iconv_ces_no_func(struct iconv_ces *ces); -int iconv_ces_nbits7(struct iconv_ces *ces); -int iconv_ces_nbits8(struct iconv_ces *ces); -int iconv_ces_zero(struct iconv_ces *ces); +API_DECLARE_NONSTD(int) apr_iconv_ces_open(const char *ces_name, struct iconv_ces **cespp, apr_pool_t *ctx); +API_DECLARE_NONSTD(int) apr_iconv_ces_close(struct iconv_ces *ces, apr_pool_t *ctx); +API_DECLARE_NONSTD(int) apr_iconv_ces_open_func(struct iconv_ces *ces, apr_pool_t *ctx); +API_DECLARE_NONSTD(int) apr_iconv_ces_close_func(struct iconv_ces *ces); +API_DECLARE_NONSTD(void) apr_iconv_ces_reset_func(struct iconv_ces *ces); +API_DECLARE_NONSTD(void) apr_iconv_ces_no_func(struct iconv_ces *ces); +API_DECLARE_NONSTD(int) apr_iconv_ces_nbits7(struct iconv_ces *ces); +API_DECLARE_NONSTD(int) apr_iconv_ces_nbits8(struct iconv_ces *ces); +API_DECLARE_NONSTD(int) apr_iconv_ces_zero(struct iconv_ces *ces); + +/* Safe for _NONSTD APIs since the C caller pops the stack and the + * apr_pool_t *cxt arg is simply ignored: + */ +#define apr_iconv_ces_open_zero (iconv_ces_open_t*)apr_iconv_ces_zero #define iconv_char32bit(ch) ((ch) & 0xFFFF0000) @@ -381,15 +398,26 @@ ICONV_CES_DRIVER_DECL(iso2022); -int iconv_mod_load(const char *, int, const void *, struct iconv_module **, apr_pool_t *); -int iconv_mod_unload(struct iconv_module *,apr_pool_t *ctx); -iconv_mod_event_t iconv_mod_noevent; - -iconv_mod_event_t iconv_ccs_event; +API_DECLARE_NONSTD(int) apr_iconv_mod_load(const char *, int, const void *, struct iconv_module **, apr_pool_t *); +API_DECLARE_NONSTD(int) apr_iconv_mod_unload(struct iconv_module *,apr_pool_t *ctx); +API_DECLARE_NONSTD(int) apr_iconv_mod_noevent(struct iconv_module *mod, int event, apr_pool_t *ctx); +API_DECLARE_NONSTD(int) apr_iconv_ccs_event(struct iconv_module *mod, int event, apr_pool_t *ctx); int iconv_malloc(apr_size_t size, void **pp); extern struct iconv_converter_desc iconv_uc_desc; + + +API_DECLARE_NONSTD(apr_status_t) apr_iconv_euc_open(struct iconv_ces *ces, apr_pool_t *ctx); +API_DECLARE_NONSTD(apr_status_t) apr_iconv_euc_close(struct iconv_ces *ces); +API_DECLARE_NONSTD(apr_ssize_t) apr_iconv_euc_convert_from_ucs(struct iconv_ces *ces, ucs_t in, unsigned char **outbuf, apr_size_t *outbytesleft); +API_DECLARE_NONSTD(ucs_t) apr_iconv_euc_convert_to_ucs(struct iconv_ces *ces, const unsigned char **inbuf, apr_size_t *inbytesleft); + +API_DECLARE_NONSTD(apr_status_t) apr_iconv_iso2022_open(struct iconv_ces *ces, apr_pool_t *ctx); +API_DECLARE_NONSTD(int) apr_iconv_iso2022_close(struct iconv_ces *ces); +API_DECLARE_NONSTD(void) apr_iconv_iso2022_reset(struct iconv_ces *ces); +API_DECLARE_NONSTD(apr_ssize_t) apr_iconv_iso2022_convert_from_ucs(struct iconv_ces *ces, ucs_t in, unsigned char **outbuf, apr_size_t *outbytesleft); +API_DECLARE_NONSTD(ucs_t) apr_iconv_iso2022_convert_to_ucs(struct iconv_ces *ces, const unsigned char **inbuf, apr_size_t *inbytesleft); #endif /* ICONV_INTERNAL */ 1.6 +4 -4 apr-iconv/lib/iconv_ccs.c Index: iconv_ccs.c =================================================================== RCS file: /home/cvs/apr-iconv/lib/iconv_ccs.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- iconv_ccs.c 28 Jun 2001 05:45:01 -0000 1.5 +++ iconv_ccs.c 2 Dec 2002 22:38:47 -0000 1.6 @@ -33,8 +33,8 @@ #define ICONV_INTERNAL #include "iconv.h" /* iconv_ccs_desc, iconv_ccs_module */ -apr_status_t -iconv_ccs_event(struct iconv_module *mod, int event, apr_pool_t *ctx) +API_DECLARE_NONSTD(int) +apr_iconv_ccs_event(struct iconv_module *mod, int event, apr_pool_t *ctx) { /* struct iconv_ccs_desc *desc = (struct iconv_ccs_desc *)mod->im_desc->imd_data;*/ @@ -49,7 +49,7 @@ case ICMODEV_UNLOAD: break; default: - return APR_EINVAL; + return EINVAL; } - return APR_SUCCESS; + return 0; } 1.6 +23 -23 apr-iconv/lib/iconv_ces.c Index: iconv_ces.c =================================================================== RCS file: /home/cvs/apr-iconv/lib/iconv_ces.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- iconv_ces.c 21 Jun 2001 12:24:12 -0000 1.5 +++ iconv_ces.c 2 Dec 2002 22:38:47 -0000 1.6 @@ -37,21 +37,21 @@ #define ICONV_INTERNAL #include "iconv.h" /* iconv_ccs_desc, iconv_ccs */ -apr_status_t -iconv_ces_open(const char *cesname, struct iconv_ces **cespp, apr_pool_t *ctx) +API_DECLARE_NONSTD(int) +apr_iconv_ces_open(const char *cesname, struct iconv_ces **cespp, apr_pool_t *ctx) { struct iconv_module *mod; struct iconv_ces *ces; apr_status_t error; - error = iconv_mod_load(cesname, ICMOD_UC_CES, NULL, &mod, ctx); + error = apr_iconv_mod_load(cesname, ICMOD_UC_CES, NULL, &mod, ctx); if (APR_STATUS_IS_EFTYPE(error)) - error = iconv_mod_load("_tbl_simple", ICMOD_UC_CES, cesname, &mod, ctx); + error = apr_iconv_mod_load("_tbl_simple", ICMOD_UC_CES, cesname, &mod, ctx); if (error != APR_SUCCESS) return (APR_STATUS_IS_EFTYPE(error)) ? APR_EINVAL : error; ces = malloc(sizeof(*ces)); if (ces == NULL) { - iconv_mod_unload(mod, ctx); + apr_iconv_mod_unload(mod, ctx); return APR_ENOMEM; } memset(ces,0, sizeof(*ces)); @@ -61,15 +61,15 @@ error = ICONV_CES_OPEN(ces,ctx); if (error != APR_SUCCESS) { free(ces); - iconv_mod_unload(mod, ctx); + apr_iconv_mod_unload(mod, ctx); return error; } *cespp = ces; return APR_SUCCESS; } -int -iconv_ces_close(struct iconv_ces *ces, apr_pool_t *ctx) +API_DECLARE_NONSTD(int) +apr_iconv_ces_close(struct iconv_ces *ces, apr_pool_t *ctx) { int res; @@ -77,50 +77,50 @@ return -1; res = ICONV_CES_CLOSE(ces); if (ces->mod != NULL) - iconv_mod_unload(ces->mod, ctx); + apr_iconv_mod_unload(ces->mod, ctx); free(ces); return res; } -int -iconv_ces_open_func(struct iconv_ces *ces) +API_DECLARE_NONSTD(int) +apr_iconv_ces_open_func(struct iconv_ces *ces, apr_pool_t *ctx) { return iconv_malloc(sizeof(int), &ces->data); } -int -iconv_ces_close_func(struct iconv_ces *ces) +API_DECLARE_NONSTD(int) +apr_iconv_ces_close_func(struct iconv_ces *ces) { free(ces->data); return 0; } -void -iconv_ces_reset_func(struct iconv_ces *ces) +API_DECLARE_NONSTD(void) +apr_iconv_ces_reset_func(struct iconv_ces *ces) { memset(ces->data, 0, sizeof(int)); } /*ARGSUSED*/ -void -iconv_ces_no_func(struct iconv_ces *ces) +API_DECLARE_NONSTD(void) +apr_iconv_ces_no_func(struct iconv_ces *ces) { } -int -iconv_ces_nbits7(struct iconv_ces *ces) +API_DECLARE_NONSTD(int) +apr_iconv_ces_nbits7(struct iconv_ces *ces) { return 7; } -int -iconv_ces_nbits8(struct iconv_ces *ces) +API_DECLARE_NONSTD(int) +apr_iconv_ces_nbits8(struct iconv_ces *ces) { return 8; } -int -iconv_ces_zero(struct iconv_ces *ces) +API_DECLARE_NONSTD(int) +apr_iconv_ces_zero(struct iconv_ces *ces) { return 0; } 1.6 +8 -8 apr-iconv/lib/iconv_ces_euc.c Index: iconv_ces_euc.c =================================================================== RCS file: /home/cvs/apr-iconv/lib/iconv_ces_euc.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- iconv_ces_euc.c 28 Jun 2001 05:45:01 -0000 1.5 +++ iconv_ces_euc.c 2 Dec 2002 22:38:47 -0000 1.6 @@ -45,8 +45,8 @@ const struct iconv_module *ccs[1]; } iconv_ces_euc_state_t; -apr_status_t -iconv_euc_open(struct iconv_ces *ces, apr_pool_t *ctx) +API_DECLARE_NONSTD(apr_status_t) +apr_iconv_euc_open(struct iconv_ces *ces, apr_pool_t *ctx) { struct iconv_module *depmod = ces->mod->im_deplist; iconv_ces_euc_state_t *state; @@ -66,8 +66,8 @@ return APR_SUCCESS; } -apr_status_t -iconv_euc_close(struct iconv_ces *ces) +API_DECLARE_NONSTD(apr_status_t) +apr_iconv_euc_close(struct iconv_ces *ces) { free(CESTOSTATE(ces)); return APR_SUCCESS; @@ -76,8 +76,8 @@ #define is_7_14bit(data) ((data)->nbits & 7) #define is_7bit(data) ((data)->nbits & 1) -apr_ssize_t -iconv_euc_convert_from_ucs(struct iconv_ces *ces, ucs_t in, +API_DECLARE_NONSTD(apr_ssize_t) +apr_iconv_euc_convert_from_ucs(struct iconv_ces *ces, ucs_t in, unsigned char **outbuf, apr_size_t *outbytesleft) { iconv_ces_euc_state_t *euc_state = CESTOSTATE(ces); @@ -143,8 +143,8 @@ return ICONV_CCS_CONVERT_TO_UCS(ccs, ch); } -ucs_t -iconv_euc_convert_to_ucs(struct iconv_ces *ces, +API_DECLARE_NONSTD(ucs_t) +apr_iconv_euc_convert_to_ucs(struct iconv_ces *ces, const unsigned char **inbuf, apr_size_t *inbytesleft) { iconv_ces_euc_state_t *euc_state = CESTOSTATE(ces); 1.6 +11 -17 apr-iconv/lib/iconv_ces_iso2022.c Index: iconv_ces_iso2022.c =================================================================== RCS file: /home/cvs/apr-iconv/lib/iconv_ces_iso2022.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- iconv_ces_iso2022.c 28 Jun 2001 05:45:02 -0000 1.5 +++ iconv_ces_iso2022.c 2 Dec 2002 22:38:47 -0000 1.6 @@ -66,8 +66,8 @@ const struct iconv_module *ccsmod[1]; } iconv_ces_iso2022_state_t; -apr_status_t -iconv_iso2022_open(struct iconv_ces *ces, apr_pool_t *ctx) +API_DECLARE_NONSTD(apr_status_t) +apr_iconv_iso2022_open(struct iconv_ces *ces, apr_pool_t *ctx) { const iconv_ces_iso2022_ccs_t *ccsattr; const struct iconv_ccs_desc *ccs; @@ -86,7 +86,7 @@ ces->data = state; state->shift_tab = (int*)((char*)state + stsz); state->org_shift_tab = ces->desc->data; - iconv_iso2022_reset(ces); + apr_iconv_iso2022_reset(ces); state->nccs = ces->mod->im_depcnt; depmod = ces->mod->im_deplist; for (i = ces->mod->im_depcnt; i; i--, depmod = depmod->im_next) { @@ -101,15 +101,15 @@ return APR_SUCCESS; } -int -iconv_iso2022_close(struct iconv_ces *ces) +API_DECLARE_NONSTD(int) +apr_iconv_iso2022_close(struct iconv_ces *ces) { free(ces->data); return 0; } -void -iconv_iso2022_reset(struct iconv_ces *ces) +API_DECLARE_NONSTD(void) +apr_iconv_iso2022_reset(struct iconv_ces *ces) { struct iconv_ces_iso2022_state *state = CESTOSTATE(ces); @@ -118,12 +118,6 @@ state->previous_char = UCS_CHAR_NONE; } -int -iconv_iso2022_nbits(struct iconv_ces *ces) -{ - return 7; -} - static void update_shift_state(const struct iconv_ces *ces, ucs_t ch) { @@ -198,8 +192,8 @@ return 1; } -apr_ssize_t -iconv_iso2022_convert_from_ucs(struct iconv_ces *ces, +API_DECLARE_NONSTD(apr_ssize_t) +apr_iconv_iso2022_convert_from_ucs(struct iconv_ces *ces, ucs_t in, unsigned char **outbuf, apr_size_t *outbytesleft) { struct iconv_ces_iso2022_state *iso_state = CESTOSTATE(ces); @@ -244,8 +238,8 @@ return ICONV_CCS_CONVERT_TO_UCS(ccs, ch); } -ucs_t -iconv_iso2022_convert_to_ucs(struct iconv_ces *ces, +API_DECLARE_NONSTD(ucs_t) +apr_iconv_iso2022_convert_to_ucs(struct iconv_ces *ces, const unsigned char **inbuf, apr_size_t *inbytesleft) { struct iconv_ces_iso2022_state *iso_state = CESTOSTATE(ces); 1.8 +9 -9 apr-iconv/lib/iconv_module.c Index: iconv_module.c =================================================================== RCS file: /home/cvs/apr-iconv/lib/iconv_module.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- iconv_module.c 28 Jun 2001 05:45:02 -0000 1.7 +++ iconv_module.c 2 Dec 2002 22:38:47 -0000 1.8 @@ -104,8 +104,8 @@ return EINVAL; } -int -iconv_mod_load(const char *modname, int modtype, const void *args, +API_DECLARE_NONSTD(int) +apr_iconv_mod_load(const char *modname, int modtype, const void *args, struct iconv_module **modpp, apr_pool_t *ctx) { struct iconv_module_desc *mdesc; @@ -137,7 +137,7 @@ depend = mdesc->imd_depend; if (depend) { while (depend->md_name) { - error = iconv_mod_load(depend->md_name, + error = apr_iconv_mod_load(depend->md_name, depend->md_type, NULL, &depmod, ctx); if (error) goto bad; @@ -162,12 +162,12 @@ *modpp = mod; return 0; bad: - iconv_mod_unload(mod,ctx); + apr_iconv_mod_unload(mod,ctx); return error; } -int -iconv_mod_unload(struct iconv_module *mod, apr_pool_t *ctx) +API_DECLARE_NONSTD(int) +apr_iconv_mod_unload(struct iconv_module *mod, apr_pool_t *ctx) { struct iconv_module *deplist, *tmp; int error = 0; @@ -179,7 +179,7 @@ deplist = mod->im_deplist; while (deplist) { tmp = deplist->im_next; - iconv_mod_unload(deplist,ctx); + apr_iconv_mod_unload(deplist,ctx); deplist = tmp; } if (mod->im_handle != NULL) @@ -189,8 +189,8 @@ return error; } -int -iconv_mod_noevent(struct iconv_module *mod, int event, apr_pool_t *ctx) +API_DECLARE_NONSTD(int) +apr_iconv_mod_noevent(struct iconv_module *mod, int event, apr_pool_t *ctx) { switch (event) { case ICMODEV_LOAD: 1.6 +4 -4 apr-iconv/lib/iconv_uc.c Index: iconv_uc.c =================================================================== RCS file: /home/cvs/apr-iconv/lib/iconv_uc.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- iconv_uc.c 28 Jun 2001 05:45:03 -0000 1.5 +++ iconv_uc.c 2 Dec 2002 22:38:47 -0000 1.6 @@ -34,11 +34,11 @@ if (ic == NULL) return APR_ENOMEM; memset(ic, 0, sizeof(*ic)); - error = iconv_ces_open(from, &ic->from, ctx); + error = apr_iconv_ces_open(from, &ic->from, ctx); if (error!=APR_SUCCESS) { goto bad; } - error = iconv_ces_open(to, &ic->to, ctx); + error = apr_iconv_ces_open(to, &ic->to, ctx); if (error!=APR_SUCCESS) { goto bad; } @@ -59,9 +59,9 @@ if (ic == NULL) return APR_EBADF; if (ic->from) - iconv_ces_close(ic->from, ctx); + apr_iconv_ces_close(ic->from, ctx); if (ic->to) - iconv_ces_close(ic->to, ctx); + apr_iconv_ces_close(ic->to, ctx); free(ic); return APR_SUCCESS; } From patrick20@example.org Mon Dec 02 22:48:01 2002 Return-Path: <patrick20@example.org> Delivered-To: patrick20@example.org Received: (qmail 84464 invoked by uid 500); 2 Dec 2002 22:48:01 -0000 Mailing-List: contact patrick20@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:patrick20@example.org> List-Help: <mailto:patrick20@example.org> List-Unsubscribe: <mailto:patrick20@example.org> List-Subscribe: <mailto:patrick20@example.org> Reply-To: patrick20@example.org Delivered-To: mailing list patrick20@example.org Received: (qmail 84453 invoked by uid 500); 2 Dec 2002 22:48:01 -0000 Delivered-To: patrick20@example.org Date: 2 Dec 2002 22:48:00 -0000 Message-ID: <patrick20@example.org> From: patrick20@example.org To: patrick20@example.org Subject: cvs commit: apr-iconv/ces _tbl_simple.c euc-jp.c euc-kr.c euc-tw.c gb2312.c iso-10646-ucs-2.c iso-10646-ucs-4.c iso-2022-cn.c iso-2022-jp-2.c iso-2022-jp.c iso-2022-kr.c ucs2-internal.c ucs4-internal.c unicode-1-1-utf-7.c utf-16.c utf-8.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N wrowe 2002/12/02 14:48:00 Modified: ccs adobe-stdenc.c adobe-symbol.c adobe-zdingbats.c big5.c cns11643-plane1.c cns11643-plane14.c cns11643-plane2.c cp037.c cp038.c cp10000.c cp10006.c cp10007.c cp10029.c cp1006.c cp10079.c cp10081.c cp1026.c cp273.c cp274.c cp275.c cp277.c cp278.c cp280.c cp281.c cp284.c cp285.c cp290.c cp297.c cp420.c cp423.c cp424.c cp437.c cp500.c cp737.c cp775.c cp850.c cp851.c cp852.c cp855.c cp856.c cp857.c cp860.c cp861.c cp862.c cp863.c cp864.c cp865.c cp866.c cp868.c cp869.c cp870.c cp871.c cp874.c cp875.c cp880.c cp891.c cp903.c cp904.c cp905.c cp918.c cp932.c cp936.c cp949.c cp950.c dec-mcs.c ebcdic-at-de-a.c ebcdic-at-de.c ebcdic-ca-fr.c ebcdic-dk-no-a.c ebcdic-dk-no.c ebcdic-es-a.c ebcdic-es-s.c ebcdic-es.c ebcdic-fi-se-a.c ebcdic-fi-se.c ebcdic-fr.c ebcdic-it.c ebcdic-pt.c ebcdic-uk.c ebcdic-us.c gb12345.c gb_2312-80.c hp-roman8.c iso-8859-1.c iso-8859-10.c iso-8859-13.c iso-8859-14.c iso-8859-15.c iso-8859-2.c iso-8859-3.c iso-8859-4.c iso-8859-5.c iso-8859-6.c iso-8859-7.c iso-8859-8.c iso-8859-9.c iso-ir-10.c iso-ir-102.c iso-ir-103.c iso-ir-11.c iso-ir-111.c iso-ir-121.c iso-ir-122.c iso-ir-123.c iso-ir-128.c iso-ir-13.c iso-ir-139.c iso-ir-14.c iso-ir-141.c iso-ir-142.c iso-ir-143.c iso-ir-146.c iso-ir-147.c iso-ir-15.c iso-ir-150.c iso-ir-151.c iso-ir-152.c iso-ir-153.c iso-ir-154.c iso-ir-155.c iso-ir-158.c iso-ir-16.c iso-ir-17.c iso-ir-18.c iso-ir-19.c iso-ir-2.c iso-ir-21.c iso-ir-25.c iso-ir-27.c iso-ir-37.c iso-ir-4.c iso-ir-47.c iso-ir-49.c iso-ir-50.c iso-ir-51.c iso-ir-54.c iso-ir-55.c iso-ir-57.c iso-ir-60.c iso-ir-61.c iso-ir-69.c iso-ir-70.c iso-ir-8-1.c iso-ir-8-2.c iso-ir-84.c iso-ir-85.c iso-ir-86.c iso-ir-88.c iso-ir-89.c iso-ir-9-1.c iso-ir-9-2.c iso-ir-90.c iso-ir-91.c iso-ir-92.c iso-ir-93.c iso-ir-94.c iso-ir-95.c iso-ir-96.c iso-ir-98.c iso-ir-99.c iso646-dk.c iso646-kr.c jis_x0201.c jis_x0208-1983.c jis_x0212-1990.c johab.c koi8-r.c koi8-ru.c koi8-u.c ksx1001.c mac-ce.c mac-croatian.c mac-cyrillic.c mac-dingbats.c mac-greek.c mac-iceland.c mac-japan.c mac-roman.c mac-romania.c mac-thai.c mac-turkish.c mac-ukraine.c macintosh.c
{'source': 'Apache Software Foundation Public Mail Archives'}