[llvm-commits] CVS: llvm/lib/System/ltdl.c

[Reid Spencer]

Changes in directory llvm/lib/System:

ltdl.c updated: 1.1 -> 1.2
---
Log message:

Mods for compilation with llvm.


---
Diffs of the changes:  (+10 -7)

Index: llvm/lib/System/ltdl.c
diff -u llvm/lib/System/ltdl.c:1.1 llvm/lib/System/ltdl.c:1.2
--- llvm/lib/System/ltdl.c:1.1	Mon Nov 29 06:02:25 2004
+++ llvm/lib/System/ltdl.c	Mon Nov 29 06:04:27 2004
@@ -25,9 +25,12 @@
 
 */
 
-#if HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include "llvm/Config/config.h"
+/*
+ #if HAVE_CONFIG_H
+ #  include <config.h>
+ #endif
+*/
 
 #if HAVE_UNISTD_H
 #  include <unistd.h>
@@ -2681,7 +2684,7 @@
       {
 	size_t lendir = LT_STRLEN (dir_name);
 
-	if (lendir +1 +lenbase >= filenamesize)
+	if (lendir +1 +lenbase >= (size_t)filenamesize)
 	{
 	  LT_DLFREE (filename);
 	  filenamesize	= lendir +1 +lenbase +1; /* "/d" + '/' + "f" + '\0' */
@@ -2690,7 +2693,7 @@
 	    goto cleanup;
 	}
 
-	assert (filenamesize > lendir);
+	assert ((size_t)filenamesize > lendir);
 	strcpy (filename, dir_name);
 
 	if (base_name && *base_name)
@@ -3134,7 +3137,7 @@
       /* canonicalize the module name */
       {
         size_t i;
-        for (i = 0; i < ext - base_name; ++i)
+        for (i = 0; i < (size_t)(ext - base_name); ++i)
 	  {
 	    if (isalnum ((int)(base_name[i])))
 	      {
@@ -3986,7 +3989,7 @@
   if (before)
     {
       assert (*ppath <= before);
-      assert (before - *ppath <= strlen (*ppath));
+      assert (before - *ppath <= (int)strlen (*ppath));
 
       before = before - *ppath + argz;
     }