diff --git a/ChangeLog b/ChangeLog
index 38d529018..7c7d5394b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-05  Quentin Mathe <quentin.mathe@gmail.com>
+
+	* Source/NSPathUtilities.m: Fixed constant string comparison error 
+	reported by Clang SVN trunk r158230 or more recent.
+	See http://llvm.org/viewvc/llvm-project?view=rev&revision=158230
+
 2012-07-02  Richard Frith-Macdonald <rfm@gnu.org>
 
         * Source/NSBundle.m: Attempted fix for bug #34191 ... change framework
diff --git a/Source/NSPathUtilities.m b/Source/NSPathUtilities.m
index e33e2642e..e7443f157 100644
--- a/Source/NSPathUtilities.m
+++ b/Source/NSPathUtilities.m
@@ -269,9 +269,11 @@ static void ShutdownPathUtilities(void);
     }\
 })
 
-/* Conditionally assign lval to var only if var is nil */
+/* Conditionally assign lval to var only if var is nil
+
+lval must be casted because Clang disallows ObjC literals comparison */
 #define TEST_ASSIGN(var, lval) ({\
-  if ((var == nil)&&(lval != nil))\
+  if ((var == nil)&&((NSString *)lval != nil))\
     {\
       var = RETAIN(lval);\
     }\