diff options
author | Yang Tse <yangsita@gmail.com> | 2013-01-04 02:50:28 +0100 |
---|---|---|
committer | Yang Tse <yangsita@gmail.com> | 2013-01-06 18:20:27 +0100 |
commit | 4a5aa6682daeea7cd7cbbb47ce3e1c310e9261c2 (patch) | |
tree | 2e85c371bf30d0a1b166b6e30cc54ebef327967b /src/Makefile.vc6 | |
parent | e0ba958e2896a1b44f00f00de4981400a47db614 (diff) | |
download | curl-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 'src/Makefile.vc6')
-rw-r--r-- | src/Makefile.vc6 | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/Makefile.vc6 b/src/Makefile.vc6 index 415eec3c1..073b20d6a 100644 --- a/src/Makefile.vc6 +++ b/src/Makefile.vc6 @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1999 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1999 - 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
@@ -134,9 +134,9 @@ CFLAGS = $(CFLAGS) /DUSE_WINDOWS_SSPI /I$(WINDOWS_SDK_PATH)\include !ENDIF
RELEASE_OBJS= \
- curl_nonblockr.obj \
- curl_rawstrr.obj \
- curl_strtoofftr.obj \
+ nonblockr.obj \
+ rawstrr.obj \
+ strtoofftr.obj \
tool_binmoder.obj \
tool_bnamer.obj \
tool_cb_dbgr.obj \
@@ -178,9 +178,9 @@ RELEASE_OBJS= \ curlr.res
DEBUG_OBJS= \
- curl_nonblockd.obj \
- curl_rawstrd.obj \
- curl_strtoofftd.obj \
+ nonblockd.obj \
+ rawstrd.obj \
+ strtoofftd.obj \
tool_binmoded.obj \
tool_bnamed.obj \
tool_cb_dbgd.obj \
@@ -341,12 +341,12 @@ debug: $(DEBUG_OBJS) $(MANIFESTTOOL)
## Release
-curl_nonblockr.obj: ../lib/curl_nonblock.c
- $(CCR) $(CFLAGS) /Fo"$@" ../lib/curl_nonblock.c
-curl_rawstrr.obj: ../lib/curl_rawstr.c
- $(CCR) $(CFLAGS) /Fo"$@" ../lib/curl_rawstr.c
-curl_strtoofftr.obj: ../lib/curl_strtoofft.c
- $(CCR) $(CFLAGS) /Fo"$@" ../lib/curl_strtoofft.c
+nonblockr.obj: ../lib/nonblock.c
+ $(CCR) $(CFLAGS) /Fo"$@" ../lib/nonblock.c
+rawstrr.obj: ../lib/rawstr.c
+ $(CCR) $(CFLAGS) /Fo"$@" ../lib/rawstr.c
+strtoofftr.obj: ../lib/strtoofft.c
+ $(CCR) $(CFLAGS) /Fo"$@" ../lib/strtoofft.c
tool_binmoder.obj: tool_binmode.c
$(CCR) $(CFLAGS) /Fo"$@" tool_binmode.c
tool_bnamer.obj: tool_bname.c
@@ -427,12 +427,12 @@ curlr.res : curl.rc $(RCR) $(RESFLAGS) /Fo"$@" curl.rc
## Debug
-curl_nonblockd.obj: ../lib/curl_nonblock.c
- $(CCD) $(CFLAGS) /Fo"$@" ../lib/curl_nonblock.c
-curl_rawstrd.obj: ../lib/curl_rawstr.c
- $(CCD) $(CFLAGS) /Fo"$@" ../lib/curl_rawstr.c
-curl_strtoofftd.obj: ../lib/curl_strtoofft.c
- $(CCD) $(CFLAGS) /Fo"$@" ../lib/curl_strtoofft.c
+nonblockd.obj: ../lib/nonblock.c
+ $(CCD) $(CFLAGS) /Fo"$@" ../lib/nonblock.c
+rawstrd.obj: ../lib/rawstr.c
+ $(CCD) $(CFLAGS) /Fo"$@" ../lib/rawstr.c
+strtoofftd.obj: ../lib/strtoofft.c
+ $(CCD) $(CFLAGS) /Fo"$@" ../lib/strtoofft.c
tool_binmoded.obj: tool_binmode.c
$(CCD) $(CFLAGS) /Fo"$@" tool_binmode.c
tool_bnamed.obj: tool_bname.c
|