diff options
author | Jan Moskyto Matejka <mq@ucw.cz> | 2016-05-10 14:30:49 +0200 |
---|---|---|
committer | Jan Moskyto Matejka <mq@ucw.cz> | 2016-05-10 14:30:49 +0200 |
commit | 0c6dfe52369a59d7f3da8ee6bc7c505e3da5c064 (patch) | |
tree | 264aa0aa4e9393491d74d473181faab4ae288cb9 /lib | |
parent | 7a7ac656829223713f9e6bcef63d2b5a5efce7d2 (diff) | |
parent | 92912f063a94bd7c743a25628ca2073380e09ef4 (diff) |
Merge branch 'int-new' into int-new-merged
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Doc | 2 | ||||
-rw-r--r-- | lib/Makefile | 7 | ||||
-rw-r--r-- | lib/Modules | 36 | ||||
-rw-r--r-- | lib/birdlib.h | 4 | ||||
-rw-r--r-- | lib/ip.h | 2 | ||||
-rw-r--r-- | lib/unaligned.h | 2 |
6 files changed, 12 insertions, 41 deletions
@@ -1,5 +1,5 @@ H Library functions -S ip.c ipv4.c ipv6.c +S ip.c S lists.c S checksum.c bitops.c patmatch.c printf.c xmalloc.c tbf.c D resource.sgml diff --git a/lib/Makefile b/lib/Makefile new file mode 100644 index 00000000..a9aae66f --- /dev/null +++ b/lib/Makefile @@ -0,0 +1,7 @@ +src := bitops.c checksum.c ip.c lists.c md5.c net.c patmatch.c printf.c sha1.c sha256.c sha512.c slists.c xmalloc.c +obj := $(src-o-files) +$(all-client) + +src := bitops.c checksum.c event.c idm.c ip.c lists.c md5.c mempool.c net.c patmatch.c printf.c resource.c sha1.c sha256.c sha512.c slab.c slists.c tbf.c xmalloc.c +obj := $(src-o-files) +$(all-daemon) diff --git a/lib/Modules b/lib/Modules deleted file mode 100644 index 6b9b4b0f..00000000 --- a/lib/Modules +++ /dev/null @@ -1,36 +0,0 @@ -sha256.c -sha256.h -sha512.c -sha512.h -sha1.c -sha1.h -birdlib.h -bitops.c -bitops.h -idm.c -idm.h -ip.c -ip.h -lists.c -lists.h -md5.c -md5.h -mempool.c -resource.c -resource.h -slab.c -socket.h -tbf.c -unaligned.h -xmalloc.c -printf.c -string.h -patmatch.c -slists.c -slists.h -event.c -event.h -checksum.c -checksum.h -alloca.h -net.c diff --git a/lib/birdlib.h b/lib/birdlib.h index ece50dc2..78df81d6 100644 --- a/lib/birdlib.h +++ b/lib/birdlib.h @@ -9,8 +9,8 @@ #ifndef _BIRD_BIRDLIB_H_ #define _BIRD_BIRDLIB_H_ -#include "timer.h" -#include "alloca.h" +#include "sysdep/unix/timer.h" +#include "lib/alloca.h" /* Ugly structure offset handling macros */ @@ -9,7 +9,7 @@ #ifndef _BIRD_IP_H_ #define _BIRD_IP_H_ -#include "lib/endian.h" +#include "sysdep/unix/endian.h" #include "lib/string.h" #include "lib/bitops.h" #include "lib/unaligned.h" diff --git a/lib/unaligned.h b/lib/unaligned.h index 130b2479..ad5811ab 100644 --- a/lib/unaligned.h +++ b/lib/unaligned.h @@ -17,7 +17,7 @@ * if possible. */ -#include "lib/endian.h" +#include "sysdep/unix/endian.h" #include "lib/string.h" static inline u16 |