com32: Move suffix_number() from libutil to libcom32

mcb30 · Feb 9, 2011 · e86bdcd · e86bdcd
1 parent 46e063f
commit e86bdcd
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/com32/libutil/include/suffix_number.h → com32/include/suffix_number.h b/com32/libutil/include/suffix_number.h → com32/include/suffix_number.h
diff --git 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 → com32/lib/suffix_number.c b/com32/libutil/suffix_number.c → 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
@@ -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