aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2008-04-04 22:58:39 +0000
committerdos-reis <gdr@axiomatics.org>2008-04-04 22:58:39 +0000
commit062183d584e13ce9c1e0d0ec678e080ef06914ac (patch)
tree14926b1c990d2f75b81412c4b54f5b057131d0c6
parentbc6f7792f8c5ef6dc6d87ca851c1e182c6a0e418 (diff)
downloadopen-axiom-062183d584e13ce9c1e0d0ec678e080ef06914ac.tar.gz
* include/xpm.h: Don't include <malloc.h>
* lib/XDither.c: Likewise. * lib/XShade.c: Likewise.
-rw-r--r--src/ChangeLog6
-rw-r--r--src/include/xpm.h1
-rw-r--r--src/lib/XDither.c3
-rw-r--r--src/lib/XShade.c3
4 files changed, 6 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1d8a5b18..536f26b8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
2008-04-04 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * include/xpm.h: Don't include <malloc.h>
+ * lib/XDither.c: Likewise.
+ * lib/XShade.c: Likewise.
+
+2008-04-04 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* include/bsdsignal.h: Include <signal.h>.
(OPENAXIOM_SIGCHLD): New macro.
* hyper/hyper.c (main): Use OPENAXIOM_SIGCHLD.
diff --git a/src/include/xpm.h b/src/include/xpm.h
index 33da4b8e..fd346b5d 100644
--- a/src/include/xpm.h
+++ b/src/include/xpm.h
@@ -61,7 +61,6 @@
#ifdef FOR_MSW
# define SYSV /* uses memcpy string.h etc. */
-# include <malloc.h>
# include "simx.h" /* defines some X stuff using MSW types */
#define NEED_STRCASECMP /* at least for MSVC++ */
#else /* FOR_MSW */
diff --git a/src/lib/XDither.c b/src/lib/XDither.c
index ab2a84b6..df2a21df 100644
--- a/src/lib/XDither.c
+++ b/src/lib/XDither.c
@@ -36,9 +36,6 @@
#include <stdio.h>
#include <stdlib.h>
-#if !defined(BSDplatform)
-#include <malloc.h>
-#endif
#include <X11/Xlib.h>
#include <X11/Xutil.h>
diff --git a/src/lib/XShade.c b/src/lib/XShade.c
index 2a89a493..5854b609 100644
--- a/src/lib/XShade.c
+++ b/src/lib/XShade.c
@@ -35,9 +35,6 @@
#ifndef MSYSplatform
#include <stdio.h>
-#if !defined(BSDplatform)
-#include <malloc.h>
-#endif
#include <stdlib.h>
#include <X11/Xlib.h>