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/10/19 10:34:36 UTC
svn commit: r586327 - /apr/apr-iconv/trunk/ces/
Author: wrowe
Date: Fri Oct 19 01:34:35 2007
New Revision: 586327
URL: http://svn.apache.org/viewvc?rev=586327&view=rev
Log:
Yuck. I just realized, it's entirely legit for any
C compiler to go and grab the system installed iconv.h
and ignore our -I with this syntax. Plus now we have
VC8 complaining our precompiled header mismatches.
Will fix this up to ensure every module follows the
correct pattern, ces is not so trivial.
Modified:
apr/apr-iconv/trunk/ces/_tbl_simple.c
apr/apr-iconv/trunk/ces/euc-jp.c
apr/apr-iconv/trunk/ces/euc-kr.c
apr/apr-iconv/trunk/ces/euc-tw.c
apr/apr-iconv/trunk/ces/gb2312.c
apr/apr-iconv/trunk/ces/iso-10646-ucs-2.c
apr/apr-iconv/trunk/ces/iso-10646-ucs-4.c
apr/apr-iconv/trunk/ces/iso-2022-cn.c
apr/apr-iconv/trunk/ces/iso-2022-jp-2.c
apr/apr-iconv/trunk/ces/iso-2022-jp.c
apr/apr-iconv/trunk/ces/iso-2022-kr.c
apr/apr-iconv/trunk/ces/ucs2-internal.c
apr/apr-iconv/trunk/ces/ucs4-internal.c
apr/apr-iconv/trunk/ces/unicode-1-1-utf-7.c
apr/apr-iconv/trunk/ces/utf-16.c
apr/apr-iconv/trunk/ces/utf-8.c
Modified: apr/apr-iconv/trunk/ces/_tbl_simple.c
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/_tbl_simple.c?rev=586327&r1=586326&r2=586327&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/_tbl_simple.c (original)
+++ apr/apr-iconv/trunk/ces/_tbl_simple.c Fri Oct 19 01:34:35 2007
@@ -30,8 +30,6 @@
* iconv (Charset Conversion Library) v1.0
*/
-#include "apr.h"
-
#define ICONV_INTERNAL
#include "iconv.h"
Modified: apr/apr-iconv/trunk/ces/euc-jp.c
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/euc-jp.c?rev=586327&r1=586326&r2=586327&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/euc-jp.c (original)
+++ apr/apr-iconv/trunk/ces/euc-jp.c Fri Oct 19 01:34:35 2007
@@ -31,7 +31,7 @@
*/
#define ICONV_INTERNAL
-#include <iconv.h>
+#include "iconv.h"
static const char * const names[] = {
"euc-jp",
Modified: apr/apr-iconv/trunk/ces/euc-kr.c
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/euc-kr.c?rev=586327&r1=586326&r2=586327&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/euc-kr.c (original)
+++ apr/apr-iconv/trunk/ces/euc-kr.c Fri Oct 19 01:34:35 2007
@@ -31,7 +31,7 @@
*/
#define ICONV_INTERNAL
-#include <iconv.h>
+#include "iconv.h"
static const char * const names[] = {
"euc-kr", "csEUCKR", NULL
Modified: apr/apr-iconv/trunk/ces/euc-tw.c
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/euc-tw.c?rev=586327&r1=586326&r2=586327&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/euc-tw.c (original)
+++ apr/apr-iconv/trunk/ces/euc-tw.c Fri Oct 19 01:34:35 2007
@@ -31,7 +31,7 @@
*/
#define ICONV_INTERNAL
-#include <iconv.h>
+#include "iconv.h"
static const char * const names[] = {
"x-euc-tw", "euc-tw", NULL
Modified: apr/apr-iconv/trunk/ces/gb2312.c
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/gb2312.c?rev=586327&r1=586326&r2=586327&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/gb2312.c (original)
+++ apr/apr-iconv/trunk/ces/gb2312.c Fri Oct 19 01:34:35 2007
@@ -31,7 +31,7 @@
*/
#define ICONV_INTERNAL
-#include <iconv.h>
+#include "iconv.h"
static const char * const names[] = {
"gb2312", "euc-cn", "csGB2312", NULL
Modified: apr/apr-iconv/trunk/ces/iso-10646-ucs-2.c
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/iso-10646-ucs-2.c?rev=586327&r1=586326&r2=586327&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/iso-10646-ucs-2.c (original)
+++ apr/apr-iconv/trunk/ces/iso-10646-ucs-2.c Fri Oct 19 01:34:35 2007
@@ -30,10 +30,9 @@
* iconv (Charset Conversion Library) v1.0
*/
-#include <stdlib.h> /* free, malloc */
-
#define ICONV_INTERNAL
-#include <iconv.h>
+#include "iconv.h"
+#include <stdlib.h> /* free, malloc */
static const char * const names[] = {
"iso-10646-ucs-2", "csUnicode", "ucs-2", NULL
Modified: apr/apr-iconv/trunk/ces/iso-10646-ucs-4.c
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/iso-10646-ucs-4.c?rev=586327&r1=586326&r2=586327&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/iso-10646-ucs-4.c (original)
+++ apr/apr-iconv/trunk/ces/iso-10646-ucs-4.c Fri Oct 19 01:34:35 2007
@@ -30,10 +30,10 @@
* iconv (Charset Conversion Library) v1.0
*/
+#define ICONV_INTERNAL
+#include "iconv.h"
#include <stdlib.h> /* free, malloc */
-#define ICONV_INTERNAL
-#include <iconv.h>
static const char * const names[] = {
"iso-10646-ucs-2", "ucs-4", "ucs4", NULL
Modified: apr/apr-iconv/trunk/ces/iso-2022-cn.c
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/iso-2022-cn.c?rev=586327&r1=586326&r2=586327&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/iso-2022-cn.c (original)
+++ apr/apr-iconv/trunk/ces/iso-2022-cn.c Fri Oct 19 01:34:35 2007
@@ -31,7 +31,7 @@
*/
#define ICONV_INTERNAL
-#include <iconv.h>
+#include "iconv.h"
static const char * const names[] = {
"iso-2022-cn", NULL
Modified: apr/apr-iconv/trunk/ces/iso-2022-jp-2.c
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/iso-2022-jp-2.c?rev=586327&r1=586326&r2=586327&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/iso-2022-jp-2.c (original)
+++ apr/apr-iconv/trunk/ces/iso-2022-jp-2.c Fri Oct 19 01:34:35 2007
@@ -31,7 +31,7 @@
*/
#define ICONV_INTERNAL
-#include <iconv.h>
+#include "iconv.h"
static const char * const names[] = {
"iso-2022-jp-2",
Modified: apr/apr-iconv/trunk/ces/iso-2022-jp.c
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/iso-2022-jp.c?rev=586327&r1=586326&r2=586327&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/iso-2022-jp.c (original)
+++ apr/apr-iconv/trunk/ces/iso-2022-jp.c Fri Oct 19 01:34:35 2007
@@ -31,7 +31,7 @@
*/
#define ICONV_INTERNAL
-#include <iconv.h>
+#include "iconv.h"
static const char * const names[] = {
"iso-2022-jp",
Modified: apr/apr-iconv/trunk/ces/iso-2022-kr.c
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/iso-2022-kr.c?rev=586327&r1=586326&r2=586327&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/iso-2022-kr.c (original)
+++ apr/apr-iconv/trunk/ces/iso-2022-kr.c Fri Oct 19 01:34:35 2007
@@ -31,7 +31,7 @@
*/
#define ICONV_INTERNAL
-#include <iconv.h>
+#include "iconv.h"
static const char * const names[] = {
"iso-2022-kr",
Modified: apr/apr-iconv/trunk/ces/ucs2-internal.c
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/ucs2-internal.c?rev=586327&r1=586326&r2=586327&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/ucs2-internal.c (original)
+++ apr/apr-iconv/trunk/ces/ucs2-internal.c Fri Oct 19 01:34:35 2007
@@ -31,7 +31,7 @@
*/
#define ICONV_INTERNAL
-#include <iconv.h>
+#include "iconv.h"
static const char * const names[] = {
"ucs2-internal", NULL
Modified: apr/apr-iconv/trunk/ces/ucs4-internal.c
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/ucs4-internal.c?rev=586327&r1=586326&r2=586327&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/ucs4-internal.c (original)
+++ apr/apr-iconv/trunk/ces/ucs4-internal.c Fri Oct 19 01:34:35 2007
@@ -31,7 +31,7 @@
*/
#define ICONV_INTERNAL
-#include <iconv.h>
+#include "iconv.h"
static const char * const names[] = {
"ucs4-internal", NULL
Modified: apr/apr-iconv/trunk/ces/unicode-1-1-utf-7.c
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/unicode-1-1-utf-7.c?rev=586327&r1=586326&r2=586327&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/unicode-1-1-utf-7.c (original)
+++ apr/apr-iconv/trunk/ces/unicode-1-1-utf-7.c Fri Oct 19 01:34:35 2007
@@ -30,10 +30,9 @@
* iconv (Charset Conversion Library) v1.0
*/
-#include <stdlib.h>
-
#define ICONV_INTERNAL
-#include <iconv.h>
+#include "iconv.h"
+#include <stdlib.h>
static const char * const names[] = {
"unicode-1-1-utf-7",
Modified: apr/apr-iconv/trunk/ces/utf-16.c
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/utf-16.c?rev=586327&r1=586326&r2=586327&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/utf-16.c (original)
+++ apr/apr-iconv/trunk/ces/utf-16.c Fri Oct 19 01:34:35 2007
@@ -31,7 +31,7 @@
*/
#define ICONV_INTERNAL
-#include <iconv.h>
+#include "iconv.h"
static const char * const names[] = {
"utf-16", "iso-10646-utf-16", "utf16", NULL
Modified: apr/apr-iconv/trunk/ces/utf-8.c
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/utf-8.c?rev=586327&r1=586326&r2=586327&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/utf-8.c (original)
+++ apr/apr-iconv/trunk/ces/utf-8.c Fri Oct 19 01:34:35 2007
@@ -30,9 +30,8 @@
* iconv (Charset Conversion Library) v1.0
*/
-/*#define ICONV_DEBUG*/
#define ICONV_INTERNAL
-#include <iconv.h>
+#include "iconv.h"
static const char * const names[] = {
"utf-8", "iso-10646-utf-8", "utf8", NULL