diff options
author | Adam Weinberger <adamw@FreeBSD.org> | 2002-10-21 21:25:48 +0000 |
---|---|---|
committer | Adam Weinberger <adamw@FreeBSD.org> | 2002-10-21 21:25:48 +0000 |
commit | daa8493eeb56678bb642e8ddb62415ef7231720b (patch) | |
tree | 5c44559ac5101c74b733015989ffcbac61ad11d7 /x11/props | |
parent | Upgrade to 2.8.0. (diff) |
Fix *alloc definition clash.
PR: 43643
Approved by: pat
Notes
Notes:
svn path=/head/; revision=68540
Diffstat (limited to 'x11/props')
-rw-r--r-- | x11/props/files/patch-ab | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/x11/props/files/patch-ab b/x11/props/files/patch-ab index 0aa5f8385e69..cad9fb899fda 100644 --- a/x11/props/files/patch-ab +++ b/x11/props/files/patch-ab @@ -1,6 +1,6 @@ ---- l10n_read.c.orig Sat Nov 8 01:21:25 1997 -+++ l10n_read.c Sun Nov 9 01:44:10 1997 -@@ -18,7 +18,7 @@ +--- l10n_read.c.orig Fri Nov 7 17:21:25 1997 ++++ l10n_read.c Mon Oct 21 03:29:17 2002 +@@ -18,15 +18,17 @@ #include "l10n_props.h" @@ -9,7 +9,17 @@ #define NAME_SEPARATOR '=' #define FIELD_SEPARATOR '|' -@@ -72,8 +72,9 @@ + #define ITEM_SEPARATOR ';' + + ++#if !defined(__FreeBSD__) + extern char *malloc(); + extern char *calloc(); ++#endif + + + /* +@@ -72,8 +74,9 @@ /* * Find path for localization configuration files under * $OPENWINHOME/share/locale/<locale>/props |