* compile.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/sandbox@2753 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/src/Makefile.in b/src/Makefile.in
index a6fcef5..47629a5 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -78,12 +78,8 @@ am_libmod_chxj_la_OBJECTS = libmod_chxj_la-mod_chxj.lo \
        libmod_chxj_la-chxj_cookie.lo libmod_chxj_la-chxj_mysql.lo \
        libmod_chxj_la-chxj_memcache.lo libmod_chxj_la-chxj_dbm.lo \
        libmod_chxj_la-chxj_buffered_write.lo \
-<<<<<<< HEAD:src/Makefile.in
        libmod_chxj_la-chxj_apache.lo libmod_chxj_la-chxj_serf.lo \
        libmod_chxj_la-chxj_css.lo
-=======
-       libmod_chxj_la-chxj_apache.lo libmod_chxj_la-chxj_serf.lo
->>>>>>> branch_0.12.0:src/Makefile.in
 libmod_chxj_la_OBJECTS = $(am_libmod_chxj_la_OBJECTS)
 libmod_chxj_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libmod_chxj_la_CFLAGS) \
@@ -268,12 +264,8 @@ libmod_chxj_la_SOURCES = mod_chxj.c \
     chxj_dbm.c \
     chxj_buffered_write.c \
     chxj_apache.c \
-<<<<<<< HEAD:src/Makefile.in
     chxj_serf.c \
     chxj_css.c
-=======
-    chxj_serf.c
->>>>>>> branch_0.12.0:src/Makefile.in
 
 libmod_chxj_la_CFLAGS = -O2 -prefer-pic @QDEFS@ @DDEFS@ -I. -I../include -I@with_apache_header@  -I./serf
 AM_CFLAGS = @CFLAGS@ -O2 -prefer-pic @QDEFS@ @DDEFS@ -I. -I../include -I@with_apache_header@
@@ -683,7 +675,6 @@ libmod_chxj_la-chxj_serf.lo: chxj_serf.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -c -o libmod_chxj_la-chxj_serf.lo `test -f 'chxj_serf.c' || echo '$(srcdir)/'`chxj_serf.c
 
-<<<<<<< HEAD:src/Makefile.in
 libmod_chxj_la-chxj_css.lo: chxj_css.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -MT libmod_chxj_la-chxj_css.lo -MD -MP -MF $(DEPDIR)/libmod_chxj_la-chxj_css.Tpo -c -o libmod_chxj_la-chxj_css.lo `test -f 'chxj_css.c' || echo '$(srcdir)/'`chxj_css.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libmod_chxj_la-chxj_css.Tpo $(DEPDIR)/libmod_chxj_la-chxj_css.Plo
@@ -691,8 +682,6 @@ libmod_chxj_la-chxj_css.lo: chxj_css.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -c -o libmod_chxj_la-chxj_css.lo `test -f 'chxj_css.c' || echo '$(srcdir)/'`chxj_css.c
 
-=======
->>>>>>> branch_0.12.0:src/Makefile.in
 mostlyclean-libtool:
        -rm -f *.lo
 

diff --git a/src/chxj_encoding.c b/src/chxj_encoding.c
index f807016..b410319 100644 (file)
--- a/src/chxj_encoding.c
+++ b/src/chxj_encoding.c
@@ -316,8 +316,6 @@ chxj_iconv(request_rec *r, apr_pool_t *pool, const char *src, apr_size_t *len, c
   size_t              result;
   apr_size_t          ilen;
   apr_size_t          olen;
-  mod_chxj_config     *dconf;
-  chxjconvrule_entry  *entryp;
 
 
   if ((int)*len < 0) {

diff --git a/src/chxj_str_util.c b/src/chxj_str_util.c
index 3936900..e15f8ec 100644 (file)
--- a/src/chxj_str_util.c
+++ b/src/chxj_str_util.c
@@ -215,6 +215,7 @@ chxj_strcount(const char *s, const char *str)
   }
   return count;
 }
+#endif
 /*
  * vim:ts=2 et
  */