1 files changed, 17 insertions, 6 deletions
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java
index 2c37eff..9422e49 100644
--- a/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java
@@ -1,6 +1,6 @@
 /*
  * 
- * Copyright 2001-2004 The Ant-Contrib project
+ * Copyright 2001-2007 The Ant-Contrib project
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -29,7 +29,13 @@ import net.sf.antcontrib.cpptasks.OptimizationEnum;
  * @author Curt Arnold
  */
 public final class ForteCCCompiler extends GccCompatibleCCompiler {
-    private static final ForteCCCompiler instance = new ForteCCCompiler("CC");
+    private final static String[] headerExtensions = new String[]{".h", ".hpp",
+            ".inl"};
+    private final static String[] sourceExtensions = new String[]{".c", ".cc",
+            ".cxx", ".cpp", ".c++", ".i", ".s"};
+    
+    private static final ForteCCCompiler instance = new ForteCCCompiler("CC", 
+            sourceExtensions, headerExtensions);
     /**
      * Gets singleton instance of this class
      */
@@ -42,8 +48,10 @@ public final class ForteCCCompiler extends GccCompatibleCCompiler {
      * Private constructor. Use ForteCCCompiler.getInstance() to get singleton
      * instance of this class.
      */
-    private ForteCCCompiler(String command) {
-        super(command, "-V", false, null, false, null);
+    private ForteCCCompiler(String command, String[] sourceExtensions, 
+            String[] headerExtensions) {
+        super(command, "-V", sourceExtensions, headerExtensions, false, null, 
+                false, null);
     }
     public void addImpliedArgs(final Vector args, 
     		final boolean debug,
@@ -83,13 +91,16 @@ public final class ForteCCCompiler extends GccCompatibleCCompiler {
                 break;
             case 1 :
             case 2 :
-                args.addElement("+w");
                 break;
             case 3 :
+                args.addElement("+w");
+                break;
             case 4 :
-            case 5 :
                 args.addElement("+w2");
                 break;
+            case 5 :
+                args.addElement("+w2");
+                args.addElement("-xwe");
         }
     }
     public File[] getEnvironmentIncludePath() {