You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2007/01/11 03:00:49 UTC
svn commit: r495090 - in /apr/apr-iconv/trunk/lib: iconv.c iconv_ces.c
iconv_ces_euc.c iconv_ces_iso2022.c iconv_int.c iconv_module.c
Author: wrowe
Date: Wed Jan 10 18:00:46 2007
New Revision: 495090
URL: http://svn.apache.org/viewvc?view=rev&rev=495090
Log:
Correct header order such that precompiled headers will function.
Modified:
apr/apr-iconv/trunk/lib/iconv.c
apr/apr-iconv/trunk/lib/iconv_ces.c
apr/apr-iconv/trunk/lib/iconv_ces_euc.c
apr/apr-iconv/trunk/lib/iconv_ces_iso2022.c
apr/apr-iconv/trunk/lib/iconv_int.c
apr/apr-iconv/trunk/lib/iconv_module.c
Modified: apr/apr-iconv/trunk/lib/iconv.c
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/lib/iconv.c?view=diff&rev=495090&r1=495089&r2=495090
==============================================================================
--- apr/apr-iconv/trunk/lib/iconv.c (original)
+++ apr/apr-iconv/trunk/lib/iconv.c Wed Jan 10 18:00:46 2007
@@ -30,14 +30,14 @@
* iconv (Charset Conversion Library) v1.0
*/
+#define ICONV_INTERNAL
+#include "iconv.h"
+
#ifndef HAVE_ICONV
#include <stdlib.h> /* free, malloc */
#include <string.h>
-#define ICONV_INTERNAL
-#include "iconv.h"
-
static struct iconv_converter_desc *converters[] = {
&iconv_uc_desc, /* CS1-UNICODE-CS2 converter */
/* &iconv_tc_desc, */ /* XLAT (table based converter) */
@@ -116,8 +116,6 @@
}
#else
-
-#include <iconv.h>
apr_status_t apr_iconv_open(const char *to_charset,
const char *from_charset, apr_pool_t *ctx, apr_iconv_t **res)
Modified: apr/apr-iconv/trunk/lib/iconv_ces.c
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/lib/iconv_ces.c?view=diff&rev=495090&r1=495089&r2=495090
==============================================================================
--- apr/apr-iconv/trunk/lib/iconv_ces.c (original)
+++ apr/apr-iconv/trunk/lib/iconv_ces.c Wed Jan 10 18:00:46 2007
@@ -30,12 +30,12 @@
* iconv (Charset Conversion Library) v1.0
*/
+#define ICONV_INTERNAL
+#include "iconv.h" /* iconv_ccs_desc, iconv_ccs */
+
#include <limits.h> /* PATH_MAX */
#include <stdlib.h> /* free, malloc */
#include <string.h>
-
-#define ICONV_INTERNAL
-#include "iconv.h" /* iconv_ccs_desc, iconv_ccs */
API_DECLARE_NONSTD(int)
apr_iconv_ces_open(const char *cesname, struct iconv_ces **cespp, apr_pool_t *ctx)
Modified: apr/apr-iconv/trunk/lib/iconv_ces_euc.c
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/lib/iconv_ces_euc.c?view=diff&rev=495090&r1=495089&r2=495090
==============================================================================
--- apr/apr-iconv/trunk/lib/iconv_ces_euc.c (original)
+++ apr/apr-iconv/trunk/lib/iconv_ces_euc.c Wed Jan 10 18:00:46 2007
@@ -30,11 +30,11 @@
* iconv (Charset Conversion Library) v1.0
*/
-#include <stdlib.h> /* free, malloc */
-#include <string.h>
-
#define ICONV_INTERNAL
#include "iconv.h"
+
+#include <stdlib.h> /* free, malloc */
+#include <string.h>
#define CESTOSTATE(ces) ((iconv_ces_euc_state_t *)(ces)->data)
#define MODTOCCS(mod) ((struct iconv_ccs_desc *)(mod)->im_desc->imd_data)
Modified: apr/apr-iconv/trunk/lib/iconv_ces_iso2022.c
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/lib/iconv_ces_iso2022.c?view=diff&rev=495090&r1=495089&r2=495090
==============================================================================
--- apr/apr-iconv/trunk/lib/iconv_ces_iso2022.c (original)
+++ apr/apr-iconv/trunk/lib/iconv_ces_iso2022.c Wed Jan 10 18:00:46 2007
@@ -30,11 +30,11 @@
* iconv (Charset Conversion Library) v1.0
*/
-#include <stdlib.h> /* free, malloc */
-#include <string.h> /* memset, memcmp, memcpy */
-
#define ICONV_INTERNAL
#include "iconv.h"
+
+#include <stdlib.h> /* free, malloc */
+#include <string.h> /* memset, memcmp, memcpy */
typedef struct {
const char *sequence;
Modified: apr/apr-iconv/trunk/lib/iconv_int.c
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/lib/iconv_int.c?view=diff&rev=495090&r1=495089&r2=495090
==============================================================================
--- apr/apr-iconv/trunk/lib/iconv_int.c (original)
+++ apr/apr-iconv/trunk/lib/iconv_int.c Wed Jan 10 18:00:46 2007
@@ -30,13 +30,13 @@
* iconv (Charset Conversion Library) v1.0
*/
+#define ICONV_INTERNAL
+#include "iconv.h"
+
#include <ctype.h> /* tolower */
#include <stdio.h> /* snprintf */
#include <stdlib.h>
#include <string.h> /* strdup, strlen */
-
-#define ICONV_INTERNAL
-#include "iconv.h"
apr_status_t
iconv_malloc(apr_size_t size, void **pp)
Modified: apr/apr-iconv/trunk/lib/iconv_module.c
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/lib/iconv_module.c?view=diff&rev=495090&r1=495089&r2=495090
==============================================================================
--- apr/apr-iconv/trunk/lib/iconv_module.c (original)
+++ apr/apr-iconv/trunk/lib/iconv_module.c Wed Jan 10 18:00:46 2007
@@ -29,8 +29,8 @@
*/
#define ICONV_INTERNAL
-
#include "iconv.h"
+
#include "apr_file_io.h"
#include "apr_file_info.h"
#include "apr_pools.h"