From 2ad3d0d449de81c86babee7bbb8026c3271711ac Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 3 Apr 2011 19:43:22 -0400
Subject: [PATCH] Code Cleanup

- Removed FEATURE_URL conditional compilation.
---
 src/import.cpp | 4 ----
 src/main.h     | 2 --
 2 files changed, 6 deletions(-)

diff --git a/src/import.cpp b/src/import.cpp
index ee39666f8..35bd6904f 100644
--- a/src/import.cpp
+++ b/src/import.cpp
@@ -1272,7 +1272,6 @@ int handleImport (std::string& outs)
 		// Use the description as a file name.
     std::string file = trim (context.task.get ("description"));
 
-#ifdef FEATURE_URL
     std::string tmpfile = "";
     Uri uri (file);
     uri.parse ();
@@ -1287,7 +1286,6 @@ int handleImport (std::string& outs)
 
       file = tmpfile;
     }
-#endif
 
     if (file.length () > 0)
     {
@@ -1344,10 +1342,8 @@ int handleImport (std::string& outs)
       case not_a_clue:    /* to stop the compiler from complaining. */ break;
       }
 
-#ifdef FEATURE_URL
       if (tmpfile != "")
         remove (tmpfile.c_str ());
-#endif
     }
     else
       throw std::string ("You must specify a file to import.");
diff --git a/src/main.h b/src/main.h
index 180158e31..549b6f3e3 100644
--- a/src/main.h
+++ b/src/main.h
@@ -29,8 +29,6 @@
 
 #define FEATURE_TDB_OPT      1   // TDB Optimization reduces file I/O.
 #define FEATURE_NEW_ID       1   // Echoes back new id.
-#define FEATURE_URL          1   // URL support for import.
-                                 // (always enabled for merge/push/pull)
 //#define FEATURE_REGEX        1   // Enables regexes for attribute modifiers,
 //                                 // subst, general search.