X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fclasspath.c;h=4809fc629c0d9802bc6b08a80d6584074cef14af;hb=20229ba96d971f97ff03ab74eeb4e7de1acccf98;hp=f875d550839fba2480b7d27395fc12ea8560880c;hpb=0213df7111578c134aaa805e82d69ebc6d84d3a4;p=gnulib.git

diff --git a/lib/classpath.c b/lib/classpath.c
index f875d5508..4809fc629 100644
--- a/lib/classpath.c
+++ b/lib/classpath.c
@@ -1,5 +1,5 @@
 /* Java CLASSPATH handling.
-   Copyright (C) 2001-2003 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -14,11 +14,9 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   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"
@@ -36,12 +34,12 @@
 #endif
 
 /* Separator in PATH like lists of pathnames.  */
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
+#if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__
   /* Win32, OS/2, DOS */
 # define PATH_SEPARATOR ';'
 #else
   /* Unix */
-# define PATH_SEPARATOR ':' 
+# define PATH_SEPARATOR ':'
 #endif
 
 /* Return the new CLASSPATH value.  The given classpaths are prepended to
@@ -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++)
     {