Revert changes relative to lib/*.[ch] recent renaming

[platform/upstream/curl.git] / lib / multi.c

diff --git a/lib/curl_multi.c b/lib/multi.c
similarity index 99%
rename from lib/curl_multi.c
rename to lib/multi.c
index 9553883..dae1f6b 100644 (file)
--- a/lib/curl_multi.c
+++ b/lib/multi.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -20,32 +20,32 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include <curl/curl.h>
 
-#include "curl_urldata.h"
-#include "curl_transfer.h"
-#include "curl_url.h"
-#include "curl_connect.h"
-#include "curl_progress.h"
-#include "curl_easyif.h"
-#include "curl_multiif.h"
-#include "curl_sendf.h"
-#include "curl_timeval.h"
-#include "curl_http.h"
-#include "curl_select.h"
-#include "curl_warnless.h"
-#include "curl_speedcheck.h"
-#include "curl_conncache.h"
-#include "curl_bundles.h"
+#include "urldata.h"
+#include "transfer.h"
+#include "url.h"
+#include "connect.h"
+#include "progress.h"
+#include "easyif.h"
+#include "multiif.h"
+#include "sendf.h"
+#include "timeval.h"
+#include "http.h"
+#include "select.h"
+#include "warnless.h"
+#include "speedcheck.h"
+#include "conncache.h"
+#include "bundles.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /*
   CURL_SOCKET_HASH_TABLE_SIZE should be a prime number. Increasing it from 97
@@ -598,7 +598,7 @@ CURLMcode curl_multi_add_handle(CURLM *multi_handle,
  *
  * Curl_hash_print(multi->sockhash, debug_print_sock_hash);
  *
- * Enable the hash print function first by editing curl_hash.c
+ * Enable the hash print function first by editing hash.c
  */
 static void debug_print_sock_hash(void *p)
 {