Module Name: src
Committed By: joerg
Date: Sun Apr 21 17:54:56 UTC 2013
Modified Files:
src/include: time.h
Log Message:
strftime_l is part of POSIX2008.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/include/time.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/time.h
diff -u src/include/time.h:1.42 src/include/time.h:1.43
--- src/include/time.h:1.42 Sun Apr 21 17:45:46 2013
+++ src/include/time.h Sun Apr 21 17:54:56 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: time.h,v 1.42 2013/04/21 17:45:46 joerg Exp $ */
+/* $NetBSD: time.h,v 1.43 2013/04/21 17:54:56 joerg Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -174,6 +174,16 @@ struct tm *localtime_r(const time_t * __
#endif
#endif
+#if (_POSIX_C_SOURCE - 0) >= 200809L || defined(_NETBSD_SOURCE)
+# ifndef __LOCALE_T_DECLARED
+typedef struct _locale *locale_t;
+# define __LOCALE_T_DECLARED
+# endif
+size_t strftime_l(char * __restrict, size_t, const char * __restrict,
+ const struct tm * __restrict, locale_t)
+ __attribute__((__format__(__strftime__, 3, 0)));
+#endif
+
#if defined(_NETBSD_SOURCE)
typedef struct __state *timezone_t;
@@ -200,24 +210,14 @@ void tzfree(const timezone_t) __RENAME(_
const char *tzgetname(const timezone_t, int) __RENAME(__tzgetname50);
#endif
-size_t strftime_z(const timezone_t, char * __restrict, size_t,
- const char * __restrict, const struct tm * __restrict)
- __attribute__((__format__(__strftime__, 4, 0)));
-
-#if (_POSIX_C_SOURCE - 0) >= 200809L || defined(_NETBSD_SOURCE)
-# ifndef __LOCALE_T_DECLARED
-typedef struct _locale *locale_t;
-# define __LOCALE_T_DECLARED
-# endif
-size_t strftime_l(char * __restrict, size_t, const char * __restrict,
- const struct tm * __restrict, locale_t)
- __attribute__((__format__(__strftime__, 3, 0)));
size_t strftime_lz(const timezone_t, char * __restrict, size_t,
const char * __restrict, const struct tm * __restrict, locale_t)
__attribute__((__format__(__strftime__, 4, 0)));
+size_t strftime_z(const timezone_t, char * __restrict, size_t,
+ const char * __restrict, const struct tm * __restrict)
+ __attribute__((__format__(__strftime__, 4, 0)));
char *strptime_l(const char * __restrict, const char * __restrict,
struct tm * __restrict, locale_t);
-#endif
#endif /* _NETBSD_SOURCE */
