[syslinux:master] com32: Move suffix_number() from libutil to libcom32
syslinux-bot for Gene Cumm
gene.cumm at gmail.com
Wed Mar 2 15:12:50 PST 2011
Commit-ID: e86bdcd32ceb8550d0b1e59b73fb0ee243f3edad
Gitweb: http://syslinux.zytor.com/commit/e86bdcd32ceb8550d0b1e59b73fb0ee243f3edad
Author: Gene Cumm <gene.cumm at gmail.com>
AuthorDate: Tue, 8 Feb 2011 19:54:20 -0500
Committer: Gene Cumm <gene.cumm at gmail.com>
CommitDate: Tue, 8 Feb 2011 19:54:20 -0500
com32: Move suffix_number() from libutil to libcom32
---
com32/{libutil => }/include/suffix_number.h | 0
com32/lib/Makefile | 2 ++
com32/{libutil => lib}/suffix_number.c | 1 -
com32/libutil/Makefile | 3 +--
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/com32/libutil/include/suffix_number.h b/com32/include/suffix_number.h
similarity index 100%
rename from com32/libutil/include/suffix_number.h
rename to com32/include/suffix_number.h
diff --git a/com32/lib/Makefile b/com32/lib/Makefile
index 2035df2..754c8c3 100644
--- a/com32/lib/Makefile
+++ b/com32/lib/Makefile
@@ -32,6 +32,8 @@ LIBOBJS = \
\
dprintf.o vdprintf.o \
\
+ suffix_number.o \
+ \
sys/readdir.o getcwd.o chdir.o fdopendir.o \
\
libgcc/__ashldi3.o libgcc/__udivdi3.o \
diff --git a/com32/libutil/suffix_number.c b/com32/lib/suffix_number.c
similarity index 98%
rename from com32/libutil/suffix_number.c
rename to com32/lib/suffix_number.c
index df073a0..49217f7 100644
--- a/com32/libutil/suffix_number.c
+++ b/com32/lib/suffix_number.c
@@ -33,7 +33,6 @@
*/
#include <stdlib.h>
-#include <suffix_number.h>
/* Get a value with a potential suffix (k/m/g/t/p/e) */
unsigned long long suffix_number(const char *str)
diff --git a/com32/libutil/Makefile b/com32/libutil/Makefile
index d9466aa..02789ca 100644
--- a/com32/libutil/Makefile
+++ b/com32/libutil/Makefile
@@ -33,8 +33,7 @@ topdir = ../..
include ../MCONFIG
LIBOBJS = ansiline.o ansiraw.o get_key.o sha1hash.o unbase64.o \
- md5.o crypt-md5.o sha256crypt.o sha512crypt.o base64.o \
- suffix_number.o
+ md5.o crypt-md5.o sha256crypt.o sha512crypt.o base64.o
LNXLIBOBJS = $(patsubst %.o,%.lo,$(LIBOBJS))
all: libutil_com.a libutil_lnx.a
More information about the Syslinux-commits
mailing list