Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TLMSP curl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CYBER - Cyber Security
TS 103 523 MSP
TLMSP
TLMSP curl
Commits
7da6a912
Commit
7da6a912
authored
12 years ago
by
Marc Hoersken
Committed by
Daniel Stenberg
12 years ago
Browse files
Options
Downloads
Patches
Plain Diff
mingw32: Fixed warning of USE_SSL being redefined
parent
61d15238
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/Makefile.m32
+3
-5
3 additions, 5 deletions
lib/Makefile.m32
src/Makefile.m32
+3
-5
3 additions, 5 deletions
src/Makefile.m32
with
6 additions
and
10 deletions
lib/Makefile.m32
+
3
−
5
View file @
7da6a912
...
...
@@ -118,7 +118,6 @@ endif
ifeq
($(findstring -schannel,$(CFG)),-schannel)
SCHANNEL
=
1
SSPI
=
1
SSL
=
1
endif
INCLUDES
=
-I
.
-I
../include
...
...
@@ -141,9 +140,6 @@ ifdef SSH2
DLL_LIBS
+=
-L
"
$(
LIBSSH2_PATH
)
/win32"
-lssh2
endif
ifdef
SSL
ifdef
SCHANNEL
CFLAGS
+=
-DUSE_SSL
-DUSE_SCHANNEL
else
ifndef
OPENSSL_INCLUDE
ifeq
"$(wildcard $(OPENSSL_PATH)/outinc)" "$(OPENSSL_PATH)/outinc"
OPENSSL_INCLUDE
=
$(
OPENSSL_PATH
)
/outinc
...
...
@@ -171,7 +167,6 @@ else
-DCURL_WANTS_CA_BUNDLE_ENV
DLL_LIBS
+=
-L
"
$(
OPENSSL_LIBPATH
)
"
$(
OPENSSL_LIBS
)
endif
endif
ifdef
ZLIB
INCLUDES
+=
-I
"
$(
ZLIB_PATH
)
"
CFLAGS
+=
-DHAVE_LIBZ
-DHAVE_ZLIB_H
...
...
@@ -191,6 +186,9 @@ endif
ifdef
SSPI
CFLAGS
+=
-DUSE_WINDOWS_SSPI
DLL_LIBS
+=
-lversion
ifdef
SCHANNEL
CFLAGS
+=
-DUSE_SCHANNEL
endif
endif
ifdef
SPNEGO
CFLAGS
+=
-DHAVE_SPNEGO
...
...
This diff is collapsed.
Click to expand it.
src/Makefile.m32
+
3
−
5
View file @
7da6a912
...
...
@@ -126,7 +126,6 @@ endif
ifeq
($(findstring -schannel,$(CFG)),-schannel)
SCHANNEL
=
1
SSPI
=
1
SSL
=
1
endif
INCLUDES
=
-I
.
-I
..
-I
../include
-I
../lib
...
...
@@ -156,9 +155,6 @@ ifdef SSH2
curl_LDADD
+=
-L
"
$(
LIBSSH2_PATH
)
/win32"
-lssh2
endif
ifdef
SSL
ifdef
SCHANNEL
CFLAGS
+=
-DUSE_SSL
-DUSE_SCHANNEL
else
ifndef
OPENSSL_LIBPATH
OPENSSL_LIBS
=
-lssl
-lcrypto
ifeq
"$(wildcard $(OPENSSL_PATH)/out)" "$(OPENSSL_PATH)/out"
...
...
@@ -177,7 +173,6 @@ else
CFLAGS
+=
-DUSE_SSLEAY
curl_LDADD
+=
-L
"
$(
OPENSSL_LIBPATH
)
"
$(
OPENSSL_LIBS
)
endif
endif
ifdef
ZLIB
INCLUDES
+=
-I
"
$(
ZLIB_PATH
)
"
CFLAGS
+=
-DHAVE_LIBZ
-DHAVE_ZLIB_H
...
...
@@ -200,6 +195,9 @@ endif
ifdef
SSPI
CFLAGS
+=
-DUSE_WINDOWS_SSPI
curl_LDADD
+=
-lversion
ifdef
SCHANNEL
CFLAGS
+=
-DUSE_SCHANNEL
endif
endif
ifdef
SPNEGO
CFLAGS
+=
-DHAVE_SPNEGO
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment