diff options
author | rdivacky <rdivacky@FreeBSD.org> | 2009-01-20 17:15:12 +0000 |
---|---|---|
committer | rdivacky <rdivacky@FreeBSD.org> | 2009-01-20 17:15:12 +0000 |
commit | 22410c51dbff14ac31a46d73234ed2fe380df2c1 (patch) | |
tree | 48dd169701c2c4f3ae9322969bb59cd404eb52ff | |
parent | 19686e364d4eaa10fb7ddc1226b367ef47a22480 (diff) | |
download | FreeBSD-src-22410c51dbff14ac31a46d73234ed2fe380df2c1.zip FreeBSD-src-22410c51dbff14ac31a46d73234ed2fe380df2c1.tar.gz |
Remove inlining of functions that are used mostly in different object files.
This gets rid of gnu89 style inlining. Also silence gcc by assigning two
variables NULL. This lets use to remove NO_WERROR.
Approved by: kib (mentor)
Approved by: harti
-rw-r--r-- | usr.bin/make/Makefile | 1 | ||||
-rw-r--r-- | usr.bin/make/buf.c | 6 | ||||
-rw-r--r-- | usr.bin/make/suff.c | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile index e5be06d..deb076f 100644 --- a/usr.bin/make/Makefile +++ b/usr.bin/make/Makefile @@ -8,7 +8,6 @@ SRCS= arch.c buf.c cond.c dir.c for.c hash.c hash_tables.c job.c \ lst.c main.c make.c parse.c proc.c shell.c str.c suff.c targ.c \ util.c var.c -NO_WERROR= WARNS?= 6 NO_SHARED?= YES diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c index 6453abf..7c6c01f 100644 --- a/usr.bin/make/buf.c +++ b/usr.bin/make/buf.c @@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$"); * Returns the number of bytes in the buffer. Doesn't include the * null-terminating byte. */ -inline size_t +size_t Buf_Size(const Buffer *buf) { @@ -70,7 +70,7 @@ Buf_Size(const Buffer *buf) * * @note Adding data to the Buffer object may invalidate the reference. */ -inline char * +char * Buf_Data(const Buffer *bp) { @@ -98,7 +98,7 @@ BufExpand(Buffer *bp, size_t nb) /** * Add a single byte to the buffer. */ -inline void +void Buf_AddByte(Buffer *bp, Byte byte) { diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c index 6963d4e..bed6c7a 100644 --- a/usr.bin/make/suff.c +++ b/usr.bin/make/suff.c @@ -514,6 +514,7 @@ Suff_AddTransform(char *line) Suff *s; /* source suffix */ Suff *t; /* target suffix */ + s = t = NULL; /* silence gcc */ gn = SuffTransFind(line); if (gn == NULL) { /* |