diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 172bf4e0ac2..28416ef2733 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,6 @@
+2004-04-14 Hoda Amer
+	Partial fix for bug#58178 : [Content Assist] No completion on GL_TRUE
+	
 2004-04-13 Hoda Amer
 	Fix for bug#57804: [Refactoring] Constructor and Destructor are not refactored when class is defined inside a namespace
 	
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java
index 1d4c1588edc..cf3d222ad2f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java
@@ -396,18 +396,20 @@ public class CompletionEngine implements RelevanceConstants {
 			String key = (String) i.next();
 			String value = ""; //$NON-NLS-1$
 			if(key.length() > prefix.length()) {
-				value = key.substring(0, prefix.length());
+				value = key.substring(0, prefix.length()).toUpperCase();
 			}else {
 				value = key;
 			}
-			if( value.equalsIgnoreCase( prefix ) ) {
+			String newPrefix = prefix.toUpperCase();
+			
+			if( value.equals( newPrefix ) ) {
 				IMacroDescriptor macroD = (IMacroDescriptor)macroMap.get(key);
 				if (macroD.getMacroType() == IMacroDescriptor.MacroType.FUNCTION_LIKE )
 					resultSet.add( macroD.getCompleteSignature() );
 				else 
 					resultSet.add( macroD.getName() );
 			}
-			else if( value.compareToIgnoreCase( prefix ) > 0 ) 
+			else if( value.compareTo( newPrefix ) > 0 )					
 				break;
 		}
 		return resultSet;		
@@ -619,13 +621,13 @@ public class CompletionEngine implements RelevanceConstants {
 	}
 	
 	public IASTCompletionNode complete(IWorkingCopy sourceUnit, int completionOffset) {
+		log(""); //$NON-NLS-1$
+
 		long startTime = System.currentTimeMillis();
 		
 		// 1- Parse the translation unit
 		IASTCompletionNode completionNode = parse(sourceUnit, completionOffset);
 		
-		log(""); //$NON-NLS-1$
-		
 		if (completionNode == null){
 			log("Null Completion Node Error"); //$NON-NLS-1$
 			return null;