X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fclasspath.c;h=4809fc629c0d9802bc6b08a80d6584074cef14af;hb=a3a70ebafd7f2fdc069d43e8a26fc246dd7fe5bb;hp=ccb66de262ab03059cdc3924850c34fa8dd9a53d;hpb=0c5bfbac92bc96cc7c6d8357d596f47a569b3b11;p=gnulib.git

diff --git a/lib/classpath.c b/lib/classpath.c
index ccb66de26..4809fc629 100644
--- a/lib/classpath.c
+++ b/lib/classpath.c
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "classpath.h"
@@ -68,7 +66,7 @@ new_classpath (const char * const *classpaths, unsigned int classpaths_count,
   if (classpaths_count > 0 && old_classpath[0] == '\0')
     length--;
 
-  result = (char *) xmalloc (length + 1);
+  result = XNMALLOC (length + 1, char);
   p = result;
   for (i = 0; i < classpaths_count; i++)
     {