aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan Nicolaescu2010-06-01 19:47:43 -0700
committerDan Nicolaescu2010-06-01 19:47:43 -0700
commit75934b1d0f47b862ec19fa8a96563176b1562154 (patch)
treed612c2df4f3c1bbd1ad11caae60956b4d7481bbd /src
parent9f32a766dca3c9777f81f028219281f201d63edc (diff)
downloademacs-75934b1d0f47b862ec19fa8a96563176b1562154.tar.gz
emacs-75934b1d0f47b862ec19fa8a96563176b1562154.zip
* src/gmalloc.c: Remove BROKEN_PROTOTYPES reference, unused.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/gmalloc.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ee0df18bd6f..c641043e400 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12010-06-02 Dan Nicolaescu <dann@ics.uci.edu> 12010-06-02 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * gmalloc.c: Remove BROKEN_PROTOTYPES reference, unused.
4
3 * s/sol2-6.h: Remove obsolete comments. 5 * s/sol2-6.h: Remove obsolete comments.
4 6
5 Remove unnecessary alloca.h includes. 7 Remove unnecessary alloca.h includes.
diff --git a/src/gmalloc.c b/src/gmalloc.c
index 6445c56e6d4..a3f533bd5e8 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -42,8 +42,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.
42#endif 42#endif
43 43
44#if ((defined __cplusplus || (defined (__STDC__) && __STDC__) \ 44#if ((defined __cplusplus || (defined (__STDC__) && __STDC__) \
45 || defined STDC_HEADERS || defined PROTOTYPES) \ 45 || defined STDC_HEADERS || defined PROTOTYPES))
46 && ! defined (BROKEN_PROTOTYPES))
47#undef PP 46#undef PP
48#define PP(args) args 47#define PP(args) args
49#undef __ptr_t 48#undef __ptr_t