summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/merge.c1
-rw-r--r--lib/rpmps.c1
-rw-r--r--misc/fnmatch.c1
-rw-r--r--misc/glob.c1
-rw-r--r--rpmio/argv.c1
-rw-r--r--rpmio/rpmlog.c1
-rw-r--r--rpmio/rpmmalloc.c4
-rw-r--r--system.h14
-rw-r--r--tools/javadeps.c1
9 files changed, 8 insertions, 17 deletions
diff --git a/lib/merge.c b/lib/merge.c
index b4163e235..9b541a661 100644
--- a/lib/merge.c
+++ b/lib/merge.c
@@ -54,6 +54,7 @@ static char sccsid[] = "@(#)merge.c 8.2 (Berkeley) 2/14/94";
*/
#include "system.h"
+#include <stdlib.h>
#include "lib/rpmdb_internal.h" /* XXX for mergesort */
#define ISIZE sizeof(int)
diff --git a/lib/rpmps.c b/lib/rpmps.c
index 2b114f0b7..bcee73243 100644
--- a/lib/rpmps.c
+++ b/lib/rpmps.c
@@ -5,6 +5,7 @@
#include "system.h"
#include <inttypes.h>
+#include <stdlib.h>
#include <rpm/rpmstring.h>
#include <rpm/rpmps.h>
diff --git a/misc/fnmatch.c b/misc/fnmatch.c
index 618317ab5..77fbd93e7 100644
--- a/misc/fnmatch.c
+++ b/misc/fnmatch.c
@@ -17,6 +17,7 @@
Boston, MA 02111-1307, USA. */
# include "system.h"
+# include <stdlib.h>
/* Find the first occurrence of C in S or the final NUL byte. */
static inline char *
diff --git a/misc/glob.c b/misc/glob.c
index 8ba181e4f..be393f8b5 100644
--- a/misc/glob.c
+++ b/misc/glob.c
@@ -24,6 +24,7 @@
# include "system.h"
+# include <stdlib.h>
# include <pwd.h>
# include <assert.h>
diff --git a/rpmio/argv.c b/rpmio/argv.c
index 7a1aa5d5a..d63346269 100644
--- a/rpmio/argv.c
+++ b/rpmio/argv.c
@@ -4,6 +4,7 @@
#include "system.h"
+#include <stdlib.h>
#include <rpm/argv.h>
#include <rpm/rpmstring.h>
diff --git a/rpmio/rpmlog.c b/rpmio/rpmlog.c
index d28876765..8023d5c44 100644
--- a/rpmio/rpmlog.c
+++ b/rpmio/rpmlog.c
@@ -4,6 +4,7 @@
#include "system.h"
#include <stdarg.h>
+#include <stdlib.h>
#include <rpm/rpmlog.h>
#include "debug.h"
diff --git a/rpmio/rpmmalloc.c b/rpmio/rpmmalloc.c
index fd93cbc2b..eec73ed8a 100644
--- a/rpmio/rpmmalloc.c
+++ b/rpmio/rpmmalloc.c
@@ -4,9 +4,7 @@
#include "system.h"
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
+#include <stdlib.h>
#include "debug.h"
diff --git a/system.h b/system.h
index 6d84f0cc8..a6e585e64 100644
--- a/system.h
+++ b/system.h
@@ -58,20 +58,6 @@ extern int errno;
#define getenv(_s) __secure_getenv(_s)
#endif
-#ifdef STDC_HEADERS
-/* FIX: shrug */
-#define getopt system_getopt
-#include <stdlib.h>
-#undef getopt
-#else /* not STDC_HEADERS */
-char *getenv (const char *name);
-#endif /* STDC_HEADERS */
-
-/* XXX solaris2.5.1 has not */
-#if !defined(EXIT_FAILURE)
-#define EXIT_FAILURE 1
-#endif
-
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#else
diff --git a/tools/javadeps.c b/tools/javadeps.c
index 43e962e35..40055b53b 100644
--- a/tools/javadeps.c
+++ b/tools/javadeps.c
@@ -64,6 +64,7 @@ marc@redhat.com and ewt@redhat.com.
#include <netinet/in.h>
*/
+#include <stdlib.h>
#include <stdarg.h>
#include <netdb.h>
#include <rpm/rpmutil.h>