aboutsummaryrefslogtreecommitdiffstats
path: root/strftime.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-08-16 00:46:12 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-08-16 00:46:12 +0000
commit31bea5d436dc36b1af96acef2329e4790dcabd20 (patch)
tree733d90d0bbbc93370f7ffbe1c58aff653fa96f35 /strftime.c
parentfd7dc23d281f38a71fa7f9c32812cd468c4b1788 (diff)
downloadruby-31bea5d436dc36b1af96acef2329e4790dcabd20.tar.gz
unecessary macros and K&R style coding
* strftime.c: remove unnecessary macros to check traditional C. https://github.com/ruby/ruby/pull/46 by lateau (Daehyub Kim). * vsnprintf.c: remove K&R. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36710 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'strftime.c')
-rw-r--r--strftime.c35
1 files changed, 1 insertions, 34 deletions
diff --git a/strftime.c b/strftime.c
index ccb180b57b..b05653ffd5 100644
--- a/strftime.c
+++ b/strftime.c
@@ -127,14 +127,8 @@ extern char *strchr();
/* min --- return minimum of two numbers */
-#ifndef __STDC__
-static inline int
-min(a, b)
-int a, b;
-#else
static inline int
min(int a, int b)
-#endif
{
return (a < b ? a : b);
}
@@ -143,14 +137,8 @@ min(int a, int b)
/* max --- return maximum of two numbers */
-#ifndef __STDC__
-static inline int
-max(a, b)
-int a, b;
-#else
static inline int
max(int a, int b)
-#endif
{
return (a > b ? a : b);
}
@@ -852,14 +840,8 @@ rb_strftime_timespec(char *s, size_t maxsize, const char *format, rb_encoding *e
/* isleap --- is a year a leap year? */
-#ifndef __STDC__
-static int
-isleap(year)
-long year;
-#else
static int
isleap(long year)
-#endif
{
return ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0);
}
@@ -893,14 +875,8 @@ vtm2tm_noyear(const struct vtm *vtm, struct tm *result)
#ifdef POSIX2_DATE
/* iso8601wknum --- compute week number according to ISO 8601 */
-#ifndef __STDC__
-static int
-iso8601wknum(timeptr)
-const struct tm *timeptr;
-#else
static int
iso8601wknum(const struct tm *timeptr)
-#endif
{
/*
* From 1003.2:
@@ -1020,15 +996,8 @@ iso8601wknum_v(const struct vtm *vtm)
/* With thanks and tip of the hatlo to ado@elsie.nci.nih.gov */
-#ifndef __STDC__
-static int
-weeknumber(timeptr, firstweekday)
-const struct tm *timeptr;
-int firstweekday;
-#else
static int
weeknumber(const struct tm *timeptr, int firstweekday)
-#endif
{
int wday = timeptr->tm_wday;
int ret;
@@ -1164,9 +1133,7 @@ static char *array[] =
/* main routine. */
int
-main(argc, argv)
-int argc;
-char **argv;
+main(int argc, char **argv)
{
long time();