diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Include.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Include.java index b2c989452c9..a5fbefd7cb6 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Include.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Include.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2000, 2008 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -104,9 +104,11 @@ public class Include extends SourceManipulation implements IInclude { } public static boolean equals(IInclude lhs, IInclude rhs) { - return CElement.equals(lhs, rhs) && - lhs.isActive() == rhs.isActive() && - lhs.isResolved() == rhs.isResolved() && - lhs.isLocal() == rhs.isLocal(); + return CElement.equals(lhs, rhs) + && lhs.isActive() == rhs.isActive() + && lhs.isResolved() == rhs.isResolved() + && lhs.isLocal() == rhs.isLocal() + && (lhs.getFullFileName() == rhs.getFullFileName() + || lhs.getFullFileName() != null && lhs.getFullFileName().equals(rhs.getFullFileName())); } }