You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2007/07/20 21:56:12 UTC
svn commit: r558109 - in /xerces/c/trunk: Projects/Win32/BCC.551/Xerces-all/
Projects/Win32/BCC.551/Xerces-all/XercesLib/ src/xercesc/dom/impl/
src/xercesc/framework/psvi/ src/xercesc/internal/ src/xercesc/util/
src/xercesc/util/NetAccessors/WinSock/
Author: amassari
Date: Fri Jul 20 12:56:10 2007
New Revision: 558109
URL: http://svn.apache.org/viewvc?view=rev&rev=558109
Log:
Make it compile with Borland tools
Modified:
xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/readme.txt
xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.cpp
xerces/c/trunk/src/xercesc/framework/psvi/XSValue.cpp
xerces/c/trunk/src/xercesc/internal/XMLReader.cpp
xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp
xerces/c/trunk/src/xercesc/util/Xerces_autoconf_config.borland.hpp
Modified: xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
URL: http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak?view=diff&rev=558109&r1=558108&r2=558109
==============================================================================
--- xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak (original)
+++ xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak Fri Jul 20 12:56:10 2007
@@ -329,7 +329,7 @@
!if !$d(WITHASM)
XERCES_NO_ASM=;XERCES_NO_ASM
!endif
-USERDEFINES = _DEBUG;XERCES_BUILDING_LIBRARY;XERCES_USE_FILEMGR_WINDOWS=1;XERCES_USE_MUTEXMGR_WINDOWS=1;XERCES_USE_ATOMICOPMGR_WINDOWS=1;XERCES_USE_NETACCESSOR_WINSOCK=1;XERCES_USE_MSGLOADER_INMEMORY=1;XERCES_USE_TRANSCODER_WINDOWS=1;XERCES_PATH_DELIMITER_BACKSLASH=1;HAVE_LIMITS_H=1;HAVE_SYS_TIMEB_H=1;HAVE_FTIME=1;HAVE_STRICMP=1;HAVE_STRNICMP=1;HAVE_WCSUPR=1;HAVE_WCSLWR=1;HAVE_WCSICMP=1;HAVE_WCSNICMP=1;$(XERCES_NO_ASM)
+USERDEFINES = _DEBUG;XERCES_BUILDING_LIBRARY;XERCES_USE_FILEMGR_WINDOWS=1;XERCES_USE_MUTEXMGR_WINDOWS=1;XERCES_USE_ATOMICOPMGR_WINDOWS=1;XERCES_USE_NETACCESSOR_WINSOCK=1;XERCES_USE_MSGLOADER_INMEMORY=1;XERCES_USE_TRANSCODER_WINDOWS=1;XERCES_PATH_DELIMITER_BACKSLASH=1;HAVE_LIMITS_H=1;HAVE_SYS_TIMEB_H=1;HAVE_FTIME=1;HAVE_STRICMP=1;HAVE_STRNICMP=1;HAVE_WCSUPR=0;HAVE_WCSLWR=0;HAVE_WCSICMP=0;HAVE_WCSNICMP=0;$(XERCES_NO_ASM)
SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
INCLUDEPATH = ..\..\..\..\..\src;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\xinclude;
LIBPATH = ..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\xinclude;
Modified: xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/readme.txt
URL: http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/readme.txt?view=diff&rev=558109&r1=558108&r2=558109
==============================================================================
--- xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/readme.txt (original)
+++ xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/readme.txt Fri Jul 20 12:56:10 2007
@@ -22,8 +22,5 @@
How to build dll (without deprecated DOM API) and tests:
make -f Xerces-all.mak
-How to build dll (with deprecated DOM API, approx. 300k larger) and tests:
- make -f Xerces-all.mak -DWITHDEPRDOM=Y
-
Vitaly Prapirny (marl@mebius.net)
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.cpp?view=diff&rev=558109&r1=558108&r2=558109
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.cpp Fri Jul 20 12:56:10 2007
@@ -188,7 +188,7 @@
// Since there is no removeAttributeNodeNS, check if this oldAttr has NS or not
const XMLCh* localName = oldAttr->getLocalName();
- unsigned int i = 0;
+ int i = 0;
if (localName)
i = fAttributes->findNamePoint(oldAttr->getNamespaceURI(), localName);
else
Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSValue.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSValue.cpp?view=diff&rev=558109&r1=558108&r2=558109
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSValue.cpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSValue.cpp Fri Jul 20 12:56:10 2007
@@ -380,6 +380,7 @@
return false;
break;
}
+ return false;
}
XMLCh*
@@ -416,6 +417,7 @@
return 0;
break;
}
+ return 0;
}
XSValue* XSValue::getActualValue(const XMLCh* const content
@@ -450,6 +452,7 @@
return 0;
break;
}
+ return 0;
}
// ---------------------------------------------------------------------------
@@ -631,9 +634,8 @@
break;
}
default:
- return false;
+ return false;
} // end switch
- return true; //both valid chars and within boundary
}
catch (const NumberFormatException&)
{
@@ -642,6 +644,7 @@
status = st_FOCA0002;
return false;
}
+ return true; //both valid chars and within boundary
}
bool XSValue::validateDateTimes(const XMLCh* const input_content
@@ -688,8 +691,6 @@
return false;
break;
}
-
- return true; //parsing succeed
}
catch (const SchemaDateTimeException &e)
@@ -704,6 +705,8 @@
status = st_FOCA0002;
return false;
}
+
+ return true; //parsing succeed
}
bool XSValue::validateStrings(const XMLCh* const content
@@ -1088,6 +1091,7 @@
return 0;
}
+ return 0;
}
XMLCh* XSValue::getCanRepDateTimes(const XMLCh* const input_content
Modified: xerces/c/trunk/src/xercesc/internal/XMLReader.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XMLReader.cpp?view=diff&rev=558109&r1=558108&r2=558109
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XMLReader.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XMLReader.cpp Fri Jul 20 12:56:10 2007
@@ -961,8 +961,8 @@
bool XMLReader::skipSpaces(bool& skippedSomething, bool inDecl)
{
// Remember the current line and column
- XMLSSize_t orgLine = fCurLine;
- XMLSSize_t orgCol = fCurCol;
+ unsigned long orgLine = fCurLine;
+ unsigned long orgCol = fCurCol;
// We enter a loop where we skip over spaces until we hit the end of
// this reader or a non-space value. The return indicates whether we
Modified: xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp?view=diff&rev=558109&r1=558108&r2=558109
==============================================================================
--- xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp Fri Jul 20 12:56:10 2007
@@ -622,12 +622,13 @@
// There was no data in the local buffer.
// Read some from the socket, straight into our caller's buffer.
//
- len = wrap_recv((SOCKET) fSocketHandle, (char *) toFill, (int)maxToRead, 0);
- if (len == SOCKET_ERROR)
+ int iLen = wrap_recv((SOCKET) fSocketHandle, (char *) toFill, (int)maxToRead, 0);
+ if (iLen == SOCKET_ERROR)
{
// Call WSAGetLastError() to get the error number.
ThrowXMLwithMemMgr(NetAccessorException, XMLExcepts::NetAcc_ReadSocket, fMemoryManager);
}
+ len = iLen;
}
fBytesProcessed += len;
Modified: xerces/c/trunk/src/xercesc/util/Xerces_autoconf_config.borland.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Xerces_autoconf_config.borland.hpp?view=diff&rev=558109&r1=558108&r2=558109
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Xerces_autoconf_config.borland.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/Xerces_autoconf_config.borland.hpp Fri Jul 20 12:56:10 2007
@@ -50,8 +50,7 @@
#define XERCES_U16BIT_INT unsigned short
#define XERCES_S32BIT_INT INT32
#define XERCES_U32BIT_INT UINT32
-// REVISIT: double check if Borland supports 64 bit integers
-#define XERCES_U64BIT_INT UINT32
+#define XERCES_U64BIT_INT UINT64
#define XERCES_XMLCH_T wchar_t
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org