aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-02-20 06:16:29 +0000
committerandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-02-20 06:16:29 +0000
commit7597d90cc0ab1d69a1302bc4001ad539430078e9 (patch)
tree032ac0365b2865d31df73359bde42e8020575457
parentb59ae6c5acd924f88fc9cb4285ed283f27c65194 (diff)
downloadbusybox-w32-7597d90cc0ab1d69a1302bc4001ad539430078e9.tar.gz
busybox-w32-7597d90cc0ab1d69a1302bc4001ad539430078e9.tar.bz2
busybox-w32-7597d90cc0ab1d69a1302bc4001ad539430078e9.zip
Oops. Put time.h after busybox.h, so we can check for BB_FEATURE_LS_TIMESTAMPS
-Erik git-svn-id: svn://busybox.net/trunk/busybox@1865 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--coreutils/ls.c8
-rw-r--r--ls.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c
index a619bb8b2..44bb8cddb 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -57,17 +57,17 @@ enum {
57#include <dirent.h> 57#include <dirent.h>
58#include <errno.h> 58#include <errno.h>
59#include <stdio.h> 59#include <stdio.h>
60#ifdef BB_FEATURE_LS_TIMESTAMPS
61#include <time.h>
62#endif
63#include <string.h> 60#include <string.h>
64#include <stdlib.h> 61#include <stdlib.h>
65
66#include <fcntl.h> 62#include <fcntl.h>
67#include <signal.h> 63#include <signal.h>
68#include <sys/ioctl.h> 64#include <sys/ioctl.h>
69#include "busybox.h" 65#include "busybox.h"
70 66
67#ifdef BB_FEATURE_LS_TIMESTAMPS
68#include <time.h>
69#endif
70
71#ifndef MAJOR 71#ifndef MAJOR
72#define MAJOR(dev) (((dev)>>8)&0xff) 72#define MAJOR(dev) (((dev)>>8)&0xff)
73#define MINOR(dev) ((dev)&0xff) 73#define MINOR(dev) ((dev)&0xff)
diff --git a/ls.c b/ls.c
index a619bb8b2..44bb8cddb 100644
--- a/ls.c
+++ b/ls.c
@@ -57,17 +57,17 @@ enum {
57#include <dirent.h> 57#include <dirent.h>
58#include <errno.h> 58#include <errno.h>
59#include <stdio.h> 59#include <stdio.h>
60#ifdef BB_FEATURE_LS_TIMESTAMPS
61#include <time.h>
62#endif
63#include <string.h> 60#include <string.h>
64#include <stdlib.h> 61#include <stdlib.h>
65
66#include <fcntl.h> 62#include <fcntl.h>
67#include <signal.h> 63#include <signal.h>
68#include <sys/ioctl.h> 64#include <sys/ioctl.h>
69#include "busybox.h" 65#include "busybox.h"
70 66
67#ifdef BB_FEATURE_LS_TIMESTAMPS
68#include <time.h>
69#endif
70
71#ifndef MAJOR 71#ifndef MAJOR
72#define MAJOR(dev) (((dev)>>8)&0xff) 72#define MAJOR(dev) (((dev)>>8)&0xff)
73#define MINOR(dev) ((dev)&0xff) 73#define MINOR(dev) ((dev)&0xff)