Author: shankar
Date: Tue Aug 30 12:42:33 2011
New Revision: 1163190
URL: http://svn.apache.org/viewvc?rev=1163190&view=rev
Log:
Fixing compilation issue in visual studio project
Modified:
axis/axis2/c/core/trunk/ides/vc9/axis2c/axiom/axiom.vcproj
axis/axis2/c/core/trunk/ides/vc9/axis2c/axis2_http_sender/axis2_http_sender.vcproj
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/heimdal/heimdal_ntlm_wrapper.c
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/ntlm.c
Modified: axis/axis2/c/core/trunk/ides/vc9/axis2c/axiom/axiom.vcproj
URL:
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/ides/vc9/axis2c/axiom/axiom.vcproj?rev=1163190&r1=1163189&r2=1163190&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/ides/vc9/axis2c/axiom/axiom.vcproj (original)
+++ axis/axis2/c/core/trunk/ides/vc9/axis2c/axiom/axiom.vcproj Tue Aug 30
12:42:33 2011
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories=".\..\..\..\..\axiom\include;.\..\..\..\..\axiom\src\om;.\..\..\..\..\axiom\src\attachments;.\..\..\..\..\util\include;"
+
AdditionalIncludeDirectories=".\..\..\..\..\axiom\include;.\..\..\..\..\axiom\src\om;.\..\..\..\..\axiom\src\attachments;.\..\..\..\..\util\include;.\..\..\..\..\axiom\src\soap"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;AXIOM_EXPORTS;AXIS2_DECLARE_EXPORT;
_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -186,9 +186,11 @@
<References>
<ProjectReference
ReferencedProjectIdentifier="{3887B3E3-1A45-40E5-BC95-9C51000C86DB}"
+
RelativePathToProject="..\ides\vc9\axis2c\axutil\axutil.vcproj"
/>
<ProjectReference
ReferencedProjectIdentifier="{D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8}"
+
RelativePathToProject="..\ides\vc9\axis2c\axis2_parser\axis2_parser.vcproj"
/>
</References>
<Files>
Modified:
axis/axis2/c/core/trunk/ides/vc9/axis2c/axis2_http_sender/axis2_http_sender.vcproj
URL:
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/ides/vc9/axis2c/axis2_http_sender/axis2_http_sender.vcproj?rev=1163190&r1=1163189&r2=1163190&view=diff
==============================================================================
---
axis/axis2/c/core/trunk/ides/vc9/axis2c/axis2_http_sender/axis2_http_sender.vcproj
(original)
+++
axis/axis2/c/core/trunk/ides/vc9/axis2c/axis2_http_sender/axis2_http_sender.vcproj
Tue Aug 30 12:42:33 2011
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\..\..\..\..\src\core\transport\http\sender;.\..\..\..\..\include;.\..\..\..\..\src\core\deployment;.\..\..\..\..\util\include;.\..\..\..\..\axiom\include;"$(OPENSSL_HOME)\include";"$(CURL_HOME)\include";"$(HEIMDAL_HOME)\inc";"
-
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;AXIS2_DECLARE_EXPORT;AXIS2_SSL_ENABLED;AXIS2_NTLM_ENABLED"
+
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;AXIS2_DECLARE_EXPORT;AXIS2_SSL_ENABLED"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -65,9 +65,9 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="axutil.lib
axis2_engine.lib axiom.lib axis2_parser.lib libeay32.lib ssleay32.lib
libheimntlm.lib"
+ AdditionalDependencies="axutil.lib
axis2_engine.lib axiom.lib axis2_parser.lib libeay32.lib ssleay32.lib"
LinkIncremental="2"
-
AdditionalLibraryDirectories=""$(SolutionDir)\deploy\lib";"$(OPENSSL_HOME)\lib";"$(CURL_HOME)\lib";D:\OpenSSL\lib;"$(HEIMDAL_HOME)\lib""
+
AdditionalLibraryDirectories=""$(SolutionDir)\deploy\lib";"$(OPENSSL_HOME)\lib";"$(CURL_HOME)\lib";"$(HEIMDAL_HOME)\lib""
GenerateDebugInformation="true"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -178,15 +178,15 @@
<References>
<ProjectReference
ReferencedProjectIdentifier="{3887B3E3-1A45-40E5-BC95-9C51000C86DB}"
- RelativePathToProject=".\axutil\axutil.vcproj"
+
RelativePathToProject="..\ides\vc9\axis2c\axutil\axutil.vcproj"
/>
<ProjectReference
ReferencedProjectIdentifier="{9524B8C5-79D9-4470-9A47-8BD163ABBB15}"
-
RelativePathToProject=".\axis2_engine\axis2_engine.vcproj"
+
RelativePathToProject="..\ides\vc9\axis2c\axis2_engine\axis2_engine.vcproj"
/>
<ProjectReference
ReferencedProjectIdentifier="{7C816A64-FA96-4C6C-8DB0-5256441F54BC}"
- RelativePathToProject=".\axiom\axiom.vcproj"
+
RelativePathToProject="..\ides\vc9\axis2c\axiom\axiom.vcproj"
/>
</References>
<Files>
Modified:
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/heimdal/heimdal_ntlm_wrapper.c
URL:
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/heimdal/heimdal_ntlm_wrapper.c?rev=1163190&r1=1163189&r2=1163190&view=diff
==============================================================================
---
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/heimdal/heimdal_ntlm_wrapper.c
(original)
+++
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/heimdal/heimdal_ntlm_wrapper.c
Tue Aug 30 12:42:33 2011
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#ifdef AXIS2_NTLM_ENABLED
#include <axis2_ntlm.h>
#include <axutil_utils_defines.h>
@@ -380,4 +381,4 @@ heimdal_ntlm_wrapper_create_type3_messag
return AXIS2_SUCCESS;
}
-
+#endif
Modified: axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/ntlm.c
URL:
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/ntlm.c?rev=1163190&r1=1163189&r2=1163190&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/ntlm.c
(original)
+++ axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/ntlm.c Tue Aug
30 12:42:33 2011
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+#ifdef AXIS2_NTLM_ENABLED
+
#include <axis2_ntlm.h>
AXIS2_EXTERN void AXIS2_CALL
@@ -56,3 +58,4 @@ axis2_ntlm_auth_create_type3_message(
uname, passwd, domain, workstation);
}
+#endif
\ No newline at end of file
