svnno****@sourc*****
svnno****@sourc*****
Fri Oct 19 09:25:35 JST 2007
Revision: 3301
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3301
Author: ikezoe
Date: 2007-10-19 09:25:35 +0900 (Fri, 19 Oct 2007)
Log Message:
-----------
2007-10-19 Hiroyuki Ikezoe <poinc****@ikezo*****>
* src/missing/kz-missing.h: #define kz_strptime.
* src/missing/strptime.c: #include "kz-missing.h".
* src/missing/Makefile.am, src/Makefile.am: Build libkzmissing.def.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/src/Makefile.am
kazehakase/trunk/src/missing/Makefile.am
kazehakase/trunk/src/missing/kz-missing.h
kazehakase/trunk/src/missing/strptime.c
Property Changed:
----------------
kazehakase/trunk/src/missing/
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-10-18 06:37:28 UTC (rev 3300)
+++ kazehakase/trunk/ChangeLog 2007-10-19 00:25:35 UTC (rev 3301)
@@ -1,3 +1,9 @@
+2007-10-19 Hiroyuki Ikezoe <poinc****@ikezo*****>
+
+ * src/missing/kz-missing.h: #define kz_strptime.
+ * src/missing/strptime.c: #include "kz-missing.h".
+ * src/missing/Makefile.am, src/Makefile.am: Build libkzmissing.def.
+
2007-10-18 Hiroyuki Ikezoe <poinc****@ikezo*****>
* src/missing/kz-missing.h: Add missing G_END_DECLS.
Modified: kazehakase/trunk/src/Makefile.am
===================================================================
--- kazehakase/trunk/src/Makefile.am 2007-10-18 06:37:28 UTC (rev 3300)
+++ kazehakase/trunk/src/Makefile.am 2007-10-19 00:25:35 UTC (rev 3301)
@@ -99,6 +99,7 @@
kazehakase_def_sources = \
$(top_builddir)/src/libkazehakase.def \
$(top_builddir)/src/actions/kzactions.def \
+ $(top_builddir)/src/missing/kzmissing.def \
$(top_builddir)/src/utils/kzutils.def
kazehakase.def: $(kazehakase_def_sources)
@@ -205,6 +206,7 @@
$(GTK_LIBS) \
$(SM_LIBS) \
$(LIBGNUTLS_LIBS) \
+ -lz \
$(libraries)
libkazehakase_la_LDFLAGS = \
Property changes on: kazehakase/trunk/src/missing
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
*.o
.libs
.deps
+ Makefile
Makefile.in
*.o
.libs
.deps
kzmissing.def
Modified: kazehakase/trunk/src/missing/Makefile.am
===================================================================
--- kazehakase/trunk/src/missing/Makefile.am 2007-10-18 06:37:28 UTC (rev 3300)
+++ kazehakase/trunk/src/missing/Makefile.am 2007-10-19 00:25:35 UTC (rev 3301)
@@ -1,13 +1,24 @@
# -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*-
+BUILT_SOURCES =
+CLEANFILES =
+
noinst_LTLIBRARIES = libkzmissing.la
INCLUDES = \
$(GTK_CFLAGS)
-libkzmissing_la_SOURCES = \
+libkzmissing_public_h_sources = \
kz-missing.h
+libkzmissing_la_SOURCES =
+
if !HAVE_STRPTIME
-libkzmissing_la_SOURCES += strptime.c
+libkzmissing_la_SOURCES += $(libkzmissing_public_h_sources) \
+ strptime.c
endif
+
+def_prefix = kzmissing
+def_sources = $(libkzmissing_public_h_sources)
+
+include $(top_srcdir)/src/generate-def.mk
Modified: kazehakase/trunk/src/missing/kz-missing.h
===================================================================
--- kazehakase/trunk/src/missing/kz-missing.h 2007-10-18 06:37:28 UTC (rev 3300)
+++ kazehakase/trunk/src/missing/kz-missing.h 2007-10-19 00:25:35 UTC (rev 3301)
@@ -29,8 +29,9 @@
G_BEGIN_DECLS
+#define kz_strptime strptime
#ifndef HAVE_STRPTIME
-extern char *strptime(const char *s, const char *format, struct tm *tm);
+extern char *kz_strptime(char *s, char *format, struct tm *tm);
#endif
G_END_DECLS
Modified: kazehakase/trunk/src/missing/strptime.c
===================================================================
--- kazehakase/trunk/src/missing/strptime.c 2007-10-18 06:37:28 UTC (rev 3300)
+++ kazehakase/trunk/src/missing/strptime.c 2007-10-19 00:25:35 UTC (rev 3301)
@@ -35,6 +35,7 @@
#include <time.h>
#include <ctype.h>
#include <string.h>
+#include "kz-missing.h"
#ifdef NT
#define strncasecmp _strnicmp
@@ -51,8 +52,6 @@
#endif
*/
-extern char *strptime(char *buf, char *fmt, struct tm *tm);
-
#define asizeof(a) (sizeof (a) / sizeof ((a)[0]))
#ifndef sun
@@ -92,7 +91,7 @@
#endif
char *
-strptime(char *buf, char *fmt, struct tm *tm)
+kz_strptime(char *buf, char *fmt, struct tm *tm)
{
char c,
*ptr;
@@ -370,3 +369,4 @@
return buf;
}
+