Reverting mainline changes which broke gcc.

git-svn-id: file:///home/sven/projects/JOGL/temp/ant-contrib/svn/ant-contrib-code/trunk/cpptasks@80 32d7a393-a5a9-423c-abd3-5d954feb1f2f

1 files changed, 21 insertions, 21 deletions

diff --git a/src/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java b/src/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java
index bf9ee13..75846a4 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java
+++ b/src/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java
@@ -39,7 +39,7 @@ public class BorlandLibrarian extends CommandLineLinker {
         return instance;
     }
     private BorlandLibrarian() {
-        super("tlib", "--version", new String[]{".obj"}, new String[0], "", ".lib", false,
+        super("tlib", "--version", new String[]{".obj"}, new String[0], ".lib", false,
                 null);
     }
     protected void addBase(long base, Vector args) {
@@ -60,12 +60,12 @@ public class BorlandLibrarian extends CommandLineLinker {
     protected void addEntry(String entry, Vector args) {
     }
     
-    protected String getCommandFileSwitch(String cmdFile) {
-        //
-        //  tlib requires quotes around paths containing -
-        //     ilink32 doesn't like them
-        StringBuffer buf = new StringBuffer("@");
-        BorlandProcessor.quoteFile(buf, cmdFile);
+    protected String getCommandFileSwitch(String cmdFile) {

+        //

+        //  tlib requires quotes around paths containing -

+        //     ilink32 doesn't like them

+        StringBuffer buf = new StringBuffer("@");

+        BorlandProcessor.quoteFile(buf, cmdFile);

         return buf.toString();
     }
     public File[] getLibraryPath() {
@@ -182,8 +182,8 @@ public class BorlandLibrarian extends CommandLineLinker {
     protected String[] prepareResponseFile(File outputFile, String[] args)
             throws IOException {
     	String[] cmdargs = BorlandProcessor.prepareResponseFile(outputFile, args, " & \n");
-        cmdargs[cmdargs.length - 1] = getCommandFileSwitch(cmdargs[cmdargs.length -1]);
-        return cmdargs;
+        cmdargs[cmdargs.length - 1] = getCommandFileSwitch(cmdargs[cmdargs.length -1]);

+        return cmdargs;

     }
     
     /**
@@ -203,17 +203,17 @@ public class BorlandLibrarian extends CommandLineLinker {
     	//  build a new library
     	super.link(task, outputFile, sourceFiles, config);
     }
-    
-    /**
-     *   Encloses problematic file names within quotes.
-     *   @param buf string buffer
-     *   @param filename source file name
-     *   @returns filename potentially enclosed in quotes.
-     */
-    protected String quoteFilename(StringBuffer buf,String filename) {
-      buf.setLength(0);
-      BorlandProcessor.quoteFile(buf, filename);
-      return buf.toString();
-    }
+    

+    /**

+     *   Encloses problematic file names within quotes.

+     *   @param buf string buffer

+     *   @param filename source file name

+     *   @returns filename potentially enclosed in quotes.

+     */

+    protected String quoteFilename(StringBuffer buf,String filename) {

+      buf.setLength(0);

+      BorlandProcessor.quoteFile(buf, filename);

+      return buf.toString();

+    }

 
 }