/* Deal with the X Resource Manager.
Copyright (C) 1990, 1993, 1994, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
/* Make sure not to #include anything after these definitions. Let's
not step on anyone's prototypes. */
#ifdef emacs
+/* darwin.h may have already defined these. */
+#undef malloc
+#undef realloc
+#undef free
#define malloc xmalloc
#define realloc xrealloc
#define free xfree
}
if (ptr == NULL)
- return "/";
+ return xstrdup ("/");
copy = (char *) malloc (strlen (ptr) + 2);
strcpy (copy, ptr);