aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkw <markw@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-03-07 18:00:44 +0000
committermarkw <markw@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-03-07 18:00:44 +0000
commitb031008bb2fc6b3998f614795ae944b64a8dc1fc (patch)
tree202827a2b726079dee522be71d8653f7b3b90a38
parent5246b7f84e7444385badb568d791d3fdda44d8dd (diff)
downloadbusybox-w32-b031008bb2fc6b3998f614795ae944b64a8dc1fc.tar.gz
busybox-w32-b031008bb2fc6b3998f614795ae944b64a8dc1fc.tar.bz2
busybox-w32-b031008bb2fc6b3998f614795ae944b64a8dc1fc.zip
Changed KILOBYTE, MEGABYTE, and GIGABYTE from #define to enum.
git-svn-id: svn://busybox.net/trunk/busybox@2002 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--busybox.h8
-rw-r--r--include/busybox.h8
2 files changed, 10 insertions, 6 deletions
diff --git a/busybox.h b/busybox.h
index 573cce190..5e46ebbd8 100644
--- a/busybox.h
+++ b/busybox.h
@@ -235,9 +235,11 @@ extern int sysinfo (struct sysinfo* info);
235#ifdef BB_FEATURE_HUMAN_READABLE 235#ifdef BB_FEATURE_HUMAN_READABLE
236const char *make_human_readable_str(unsigned long val, unsigned long hr); 236const char *make_human_readable_str(unsigned long val, unsigned long hr);
237#endif 237#endif
238#define KILOBYTE 1024 238enum {
239#define MEGABYTE (KILOBYTE*1024) 239 KILOBYTE = 1024,
240#define GIGABYTE (MEGABYTE*1024) 240 MEGABYTE = (KILOBYTE*1024),
241 GIGABYTE = (MEGABYTE*1024)
242};
241 243
242#ifdef BB_FEATURE_BUFFERS_GO_ON_STACK 244#ifdef BB_FEATURE_BUFFERS_GO_ON_STACK
243#define RESERVE_BB_BUFFER(buffer,len) char buffer[len] 245#define RESERVE_BB_BUFFER(buffer,len) char buffer[len]
diff --git a/include/busybox.h b/include/busybox.h
index 573cce190..5e46ebbd8 100644
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -235,9 +235,11 @@ extern int sysinfo (struct sysinfo* info);
235#ifdef BB_FEATURE_HUMAN_READABLE 235#ifdef BB_FEATURE_HUMAN_READABLE
236const char *make_human_readable_str(unsigned long val, unsigned long hr); 236const char *make_human_readable_str(unsigned long val, unsigned long hr);
237#endif 237#endif
238#define KILOBYTE 1024 238enum {
239#define MEGABYTE (KILOBYTE*1024) 239 KILOBYTE = 1024,
240#define GIGABYTE (MEGABYTE*1024) 240 MEGABYTE = (KILOBYTE*1024),
241 GIGABYTE = (MEGABYTE*1024)
242};
241 243
242#ifdef BB_FEATURE_BUFFERS_GO_ON_STACK 244#ifdef BB_FEATURE_BUFFERS_GO_ON_STACK
243#define RESERVE_BB_BUFFER(buffer,len) char buffer[len] 245#define RESERVE_BB_BUFFER(buffer,len) char buffer[len]