diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2010-01-05 15:17:34 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2010-01-05 15:17:34 +0200 |
| commit | e3638c2c86fd10831136419db2601cb4daf3d3bb (patch) | |
| tree | abf04b5647d86cd4fc290af959297565219320ba | |
| parent | dab8a648dbc91b56c4b375cf2218a769856b8e34 (diff) | |
| download | librpm-tizen-e3638c2c86fd10831136419db2601cb4daf3d3bb.tar.gz librpm-tizen-e3638c2c86fd10831136419db2601cb4daf3d3bb.tar.bz2 librpm-tizen-e3638c2c86fd10831136419db2601cb4daf3d3bb.zip | |
Remove <string.h> include from system.h into the few places that still need
- most of the places get it through <rpm/rpmstring.h> already
| -rw-r--r-- | lib/merge.c | 1 | ||||
| -rw-r--r-- | misc/glob.c | 1 | ||||
| -rw-r--r-- | rpmio/fts.c | 1 | ||||
| -rw-r--r-- | rpmio/rpmmalloc.c | 1 | ||||
| -rw-r--r-- | system.h | 4 | ||||
| -rw-r--r-- | tools/javadeps.c | 1 |
6 files changed, 5 insertions, 4 deletions
diff --git a/lib/merge.c b/lib/merge.c index 9b541a661..5fcd9a40a 100644 --- a/lib/merge.c +++ b/lib/merge.c @@ -55,6 +55,7 @@ static char sccsid[] = "@(#)merge.c 8.2 (Berkeley) 2/14/94"; #include "system.h" #include <stdlib.h> +#include <string.h> #include "lib/rpmdb_internal.h" /* XXX for mergesort */ #define ISIZE sizeof(int) diff --git a/misc/glob.c b/misc/glob.c index be393f8b5..28e6edda5 100644 --- a/misc/glob.c +++ b/misc/glob.c @@ -25,6 +25,7 @@ # include "system.h" # include <stdlib.h> +# include <string.h> # include <pwd.h> # include <assert.h> diff --git a/rpmio/fts.c b/rpmio/fts.c index 325e1a91f..ec9636b7c 100644 --- a/rpmio/fts.c +++ b/rpmio/fts.c @@ -61,6 +61,7 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; # define _STAT_VER 0 #endif #include "system.h" +#include <string.h> #include "rpmio/fts.h" #include <rpm/rpmio.h> #include <rpm/rpmurl.h> diff --git a/rpmio/rpmmalloc.c b/rpmio/rpmmalloc.c index eec73ed8a..6c640c858 100644 --- a/rpmio/rpmmalloc.c +++ b/rpmio/rpmmalloc.c @@ -5,6 +5,7 @@ #include "system.h" #include <stdlib.h> +#include <string.h> #include "debug.h" @@ -32,10 +32,6 @@ extern char ** environ; #endif #endif -#ifdef HAVE_STRING_H -# include <string.h> -#endif - #if !defined(HAVE_STPCPY) char * stpcpy(char * dest, const char * src); #endif diff --git a/tools/javadeps.c b/tools/javadeps.c index 40055b53b..9b68cabd3 100644 --- a/tools/javadeps.c +++ b/tools/javadeps.c @@ -66,6 +66,7 @@ marc@redhat.com and ewt@redhat.com. #include <stdlib.h> #include <stdarg.h> +#include <string.h> #include <netdb.h> #include <rpm/rpmutil.h> #include "debug.h" |