From 4a5aa6682daeea7cd7cbbb47ce3e1c310e9261c2 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Fri, 4 Jan 2013 02:50:28 +0100
Subject: Revert changes relative to lib/*.[ch] recent renaming

This reverts renaming and usage of lib/*.h header files done
28-12-2012, reverting 2 commits:

  f871de0... build: make use of 76 lib/*.h renamed files
  ffd8e12... build: rename 76 lib/*.h files

This also reverts removal of redundant include guard (redundant thanks
to changes in above commits) done 2-12-2013, reverting 1 commit:

  c087374... curl_setup.h: remove redundant include guard

This also reverts renaming and usage of lib/*.c source files done
3-12-2013, reverting 3 commits:

  13606bb... build: make use of 93 lib/*.c renamed files
  5b6e792... build: rename 93 lib/*.c files
  7d83dff... build: commit 13606bbfde follow-up 1

Start of related discussion thread:

  http://curl.haxx.se/mail/lib-2013-01/0012.html

Asking for confirmation on pushing this revertion commit:

  http://curl.haxx.se/mail/lib-2013-01/0048.html

Confirmation summary:

  http://curl.haxx.se/mail/lib-2013-01/0079.html

NOTICE: The list of 2 files that have been modified by other
intermixed commits, while renamed, and also by at least one
of the 6 commits this one reverts follows below. These 2 files
will exhibit a hole in history unless git's '--follow' option
is used when viewing logs.

  lib/curl_imap.h
  lib/curl_smtp.h
---
 tests/unit/unit1300.c | 2 +-
 tests/unit/unit1301.c | 2 +-
 tests/unit/unit1302.c | 6 +++---
 tests/unit/unit1303.c | 6 +++---
 tests/unit/unit1304.c | 2 +-
 tests/unit/unit1305.c | 6 +++---
 tests/unit/unit1309.c | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/unit1300.c b/tests/unit/unit1300.c
index ba27e4ecc..2b8341683 100644
--- a/tests/unit/unit1300.c
+++ b/tests/unit/unit1300.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "curl_llist.h"
+#include "llist.h"
 
 static struct curl_llist *llist;
 
diff --git a/tests/unit/unit1301.c b/tests/unit/unit1301.c
index 5baf4d5c0..47df481a8 100644
--- a/tests/unit/unit1301.c
+++ b/tests/unit/unit1301.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "curl_strequal.h"
+#include "strequal.h"
 
 static CURLcode unit_setup( void ) {return CURLE_OK;}
 static void unit_stop( void ) {}
diff --git a/tests/unit/unit1302.c b/tests/unit/unit1302.c
index e431fffca..fc50c8865 100644
--- a/tests/unit/unit1302.c
+++ b/tests/unit/unit1302.c
@@ -21,10 +21,10 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "curl_urldata.h"
-#include "curl_url.h"
+#include "urldata.h"
+#include "url.h" /* for Curl_safefree */
 #include "curl_base64.h"
-#include "curl_memdebug.h" /* LAST include file */
+#include "memdebug.h" /* LAST include file */
 
 static struct SessionHandle *data;
 
diff --git a/tests/unit/unit1303.c b/tests/unit/unit1303.c
index 7e9dbc158..2e4f23096 100644
--- a/tests/unit/unit1303.c
+++ b/tests/unit/unit1303.c
@@ -21,9 +21,9 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "curl_urldata.h"
-#include "curl_connect.h"
-#include "curl_memdebug.h" /* LAST include file */
+#include "urldata.h"
+#include "connect.h"
+#include "memdebug.h" /* LAST include file */
 
 static struct SessionHandle *data;
 
diff --git a/tests/unit/unit1304.c b/tests/unit/unit1304.c
index 3ebd89cbd..8ddd8caee 100644
--- a/tests/unit/unit1304.c
+++ b/tests/unit/unit1304.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "curl_netrc.h"
+#include "netrc.h"
 
 static char login[LOGINSIZE];
 static char password[PASSWORDSIZE];
diff --git a/tests/unit/unit1305.c b/tests/unit/unit1305.c
index a4b431114..5900c6dd5 100644
--- a/tests/unit/unit1305.c
+++ b/tests/unit/unit1305.c
@@ -34,11 +34,11 @@
 #define ENABLE_CURLX_PRINTF
 #include "curlx.h"
 
-#include "curl_hash.h"
-#include "curl_hostip.h"
+#include "hash.h"
+#include "hostip.h"
 
 #include "curl_memory.h"
-#include "curl_memdebug.h" /* LAST include file */
+#include "memdebug.h" /* LAST include file */
 
 static struct SessionHandle *data;
 static struct curl_hash *hp;
diff --git a/tests/unit/unit1309.c b/tests/unit/unit1309.c
index 4a741a19d..1304ba18e 100644
--- a/tests/unit/unit1309.c
+++ b/tests/unit/unit1309.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "curl_splay.h"
+#include "splay.h"
 
 
 static CURLcode unit_setup(void)
-- 
cgit v1.2.3