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 /winbuild | |
| parent | e0ba958e2896a1b44f00f00de4981400a47db614 (diff) | |
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 'winbuild')
| -rw-r--r-- | winbuild/MakefileBuild.vc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 921fb066d..5e8b39253 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -455,9 +455,9 @@ CURL_LIBCURL_LIBNAME=$(LIB_NAME_IMP) !ENDIF
CURL_FROM_LIBCURL=$(CURL_DIROBJ)\tool_hugehelp.obj \
- $(CURL_DIROBJ)\curl_nonblock.obj \
- $(CURL_DIROBJ)\curl_rawstr.obj \
- $(CURL_DIROBJ)\curl_strtoofft.obj
+ $(CURL_DIROBJ)\nonblock.obj \
+ $(CURL_DIROBJ)\rawstr.obj \
+ $(CURL_DIROBJ)\strtoofft.obj
$(PROGRAM_NAME): $(CURL_DIROBJ) $(CURL_FROM_LIBCURL) $(EXE_OBJS)
$(CURL_LINK) $(CURL_LFLAGS) $(CURL_LIBCURL_LIBNAME) $(WIN_LIBS) $(CURL_FROM_LIBCURL) $(EXE_OBJS)
@@ -468,12 +468,12 @@ $(PROGRAM_NAME): $(CURL_DIROBJ) $(CURL_FROM_LIBCURL) $(EXE_OBJS) $(CURL_DIROBJ)\tool_hugehelp.obj: $(CURL_SRC_DIR)\tool_hugehelp.c
$(CURL_CC) $(CURL_CFLAGS) /Zm200 /Fo"$@" $(CURL_SRC_DIR)\tool_hugehelp.c
-$(CURL_DIROBJ)\curl_nonblock.obj: ../lib/curl_nonblock.c
- $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curl_nonblock.c
-$(CURL_DIROBJ)\curl_rawstr.obj: ../lib/curl_rawstr.c
- $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curl_rawstr.c
-$(CURL_DIROBJ)\curl_strtoofft.obj: ../lib/curl_strtoofft.c
- $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curl_strtoofft.c
+$(CURL_DIROBJ)\nonblock.obj: ../lib/nonblock.c
+ $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/nonblock.c
+$(CURL_DIROBJ)\rawstr.obj: ../lib/rawstr.c
+ $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/rawstr.c
+$(CURL_DIROBJ)\strtoofft.obj: ../lib/strtoofft.c
+ $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/strtoofft.c
$(CURL_DIROBJ)\curl.res: $(CURL_SRC_DIR)\curl.rc
rc $(CURL_RC_FLAGS)
|