summaryrefslogtreecommitdiff
path: root/packages/OS400
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2013-01-04 02:50:28 +0100
committerYang Tse <yangsita@gmail.com>2013-01-06 18:20:27 +0100
commit4a5aa6682daeea7cd7cbbb47ce3e1c310e9261c2 (patch)
tree2e85c371bf30d0a1b166b6e30cc54ebef327967b /packages/OS400
parente0ba958e2896a1b44f00f00de4981400a47db614 (diff)
downloadcurl-4a5aa6682daeea7cd7cbbb47ce3e1c310e9261c2.tar.gz
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
Diffstat (limited to 'packages/OS400')
-rw-r--r--packages/OS400/ccsidcurl.c10
-rw-r--r--packages/OS400/make-lib.sh14
-rw-r--r--packages/OS400/os400sys.c4
3 files changed, 14 insertions, 14 deletions
diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c
index 4ef9acbf6..1baff3951 100644
--- a/packages/OS400/ccsidcurl.c
+++ b/packages/OS400/ccsidcurl.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2010, 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
@@ -32,10 +32,10 @@
#pragma enum(int)
#include "curl.h"
-#include "curl_mprintf.h"
-#include "curl_urldata.h"
-#include "curl_url.h"
-#include "curl_getinfo.h"
+#include "mprintf.h"
+#include "urldata.h"
+#include "url.h"
+#include "getinfo.h"
#include "ccsidcurl.h"
#include "os400sys.h"
diff --git a/packages/OS400/make-lib.sh b/packages/OS400/make-lib.sh
index d9c6e9e95..a9e1c3861 100644
--- a/packages/OS400/make-lib.sh
+++ b/packages/OS400/make-lib.sh
@@ -13,7 +13,7 @@ cd "${TOPDIR}/lib"
echo '#pragma comment(user, "libcurl version '"${LIBCURL_VERSION}"'")' > os400.c
echo '#pragma comment(user, __DATE__)' >> os400.c
echo '#pragma comment(user, __TIME__)' >> os400.c
-echo '#pragma comment(copyright, "Copyright (C) 1998-2013 Daniel Stenberg et al. OS/400 version by P. Monnerat")' >> os400.c
+echo '#pragma comment(copyright, "Copyright (C) 1998-2012 Daniel Stenberg et al. OS/400 version by P. Monnerat")' >> os400.c
make_module OS400 os400.c
LINK= # No need to rebuild service program yet.
MODULES=
@@ -151,13 +151,13 @@ fi
if [ "${TEST_FORMDATA}" ]
then MODULES=
- make_module TFORMDATA curl_formdata.c "'_FORM_DEBUG' 'CURLDEBUG'"
- make_module TSTREQUAL curl_strequal.c "'_FORM_DEBUG' 'CURLDEBUG'"
- make_module TMEMDEBUG curl_memdebug.c "'_FORM_DEBUG' 'CURLDEBUG'"
- make_module TMPRINTF curl_mprintf.c "'_FORM_DEBUG' 'CURLDEBUG'"
- make_module TSTRERROR curl_strerror.c "'_FORM_DEBUG' 'CURLDEBUG'"
+ make_module TFORMDATA formdata.c "'_FORM_DEBUG' 'CURLDEBUG'"
+ make_module TSTREQUAL strequal.c "'_FORM_DEBUG' 'CURLDEBUG'"
+ make_module TMEMDEBUG memdebug.c "'_FORM_DEBUG' 'CURLDEBUG'"
+ make_module TMPRINTF mprintf.c "'_FORM_DEBUG' 'CURLDEBUG'"
+ make_module TSTRERROR strerror.c "'_FORM_DEBUG' 'CURLDEBUG'"
# The following modules should not be needed (see comment in
- # curl_formdata.c. However, there are some unsatisfied
+ # formdata.c. However, there are some unsatisfied
# external references leading in the following
# modules to be (recursively) needed.
MODULES="${MODULES} EASY STRDUP SSLGEN QSSL HOSTIP HOSTIP4 HOSTIP6"
diff --git a/packages/OS400/os400sys.c b/packages/OS400/os400sys.c
index 61ae1e0f3..5527ce720 100644
--- a/packages/OS400/os400sys.c
+++ b/packages/OS400/os400sys.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, 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
@@ -24,7 +24,7 @@
/* OS/400 additional support. */
#include "curlbuild.h"
-#include "config-os400.h" /* Not curl_setup.h: we only need some defines. */
+#include "config-os400.h" /* Not setup.h: we only need some defines. */
#include <sys/types.h>
#include <sys/socket.h>