projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add mappings for Big5 code points.
[chise/xemacs-chise.git-]
/
src
/
strftime.c
diff --git
a/src/strftime.c
b/src/strftime.c
index
cb0c111
..
926806d
100644
(file)
--- a/
src/strftime.c
+++ b/
src/strftime.c
@@
-94,13
+94,13
@@
time_t mktime ();
#endif
time_t mktime ();
#endif
-#if defined(WINDOWSNT) || defined(__CYGWIN32__)
+#if defined(WIN32_NATIVE) || defined(CYGWIN)
#include <time.h>
#else
#if defined(HAVE_TZNAME)
extern char *tzname[2];
#endif
#include <time.h>
#else
#if defined(HAVE_TZNAME)
extern char *tzname[2];
#endif
-#endif /* WINDOWSNT */
+#endif /* WIN32_NATIVE */
#ifdef emacs
#define strftime emacs_strftime
#ifdef emacs
#define strftime emacs_strftime
@@
-112,12
+112,12
@@
enum padding
none, blank, zero
};
none, blank, zero
};
-static char CONST* CONST days[] =
+static char const* const days[] =
{
"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
};
{
"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
};
-static char CONST * CONST months[] =
+static char const * const months[] =
{
"January", "February", "March", "April", "May", "June",
"July", "August", "September", "October", "November", "December"
{
"January", "February", "March", "April", "May", "June",
"July", "August", "September", "October", "November", "December"
@@
-174,7
+174,7
@@
add_num3 (char *string, int num, int max, enum padding pad)
/* Like strncpy except return the number of characters copied. */
static int
/* Like strncpy except return the number of characters copied. */
static int
-add_str (char *to, CONST char *from, int max)
+add_str (char *to, const char *from, int max)
{
int i;
{
int i;
@@
-203,7
+203,7
@@
add_num_time_t (char *string, int max, time_t num)
starting on Sundays. */
static int
starting on Sundays. */
static int
-sun_week (CONST struct tm *tm)
+sun_week (const struct tm *tm)
{
int dl;
{
int dl;
@@
-220,7
+220,7
@@
sun_week (CONST struct tm *tm)
starting on Mondays. */
static int
starting on Mondays. */
static int
-mon_week (CONST struct tm *tm)
+mon_week (const struct tm *tm)
{
int dl, wday;
{
int dl, wday;
@@
-233,8
+233,9
@@
mon_week (CONST struct tm *tm)
}
#if !defined(HAVE_TM_ZONE) && !defined(HAVE_TZNAME)
}
#if !defined(HAVE_TM_ZONE) && !defined(HAVE_TZNAME)
+char *zone_name (const struct tm *tp);
char *
char *
-zone_name (CONST struct tm *tp)
+zone_name (const struct tm *tp)
{
char *timezone ();
struct timeval tv;
{
char *timezone ();
struct timeval tv;
@@
-251,11
+252,11
@@
zone_name (CONST struct tm *tp)
that were put into STRING, or 0 if the length would have
exceeded MAX. */
that were put into STRING, or 0 if the length would have
exceeded MAX. */
-size_t strftime (char *string, size_t max, CONST char *format,
- CONST struct tm *tm);
+size_t strftime (char *string, size_t max, const char *format,
+ const struct tm *tm);
size_t
size_t
-strftime (char *string, size_t max, CONST char *format, CONST struct tm *tm)
+strftime (char *string, size_t max, const char *format, const struct tm *tm)
{
enum padding pad; /* Type of padding to apply. */
size_t length = 0; /* Characters put in STRING so far. */
{
enum padding pad; /* Type of padding to apply. */
size_t length = 0; /* Characters put in STRING so far. */