diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-16 21:57:00 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-16 21:57:00 +0200 |
| commit | 7e86fc3fe72f67b0d9240b4afad28c66dc482c80 (patch) | |
| tree | c1bfce666bd075311fcfadb6fd690d48b671a870 | |
| parent | 9eda1ec830413271cce82a3115b66d05ea00c91f (diff) | |
Initial hacks for 64-bit Windows build
| -rw-r--r-- | sal/inc/osl/endian.h | 2 | ||||
| -rw-r--r-- | sal/osl/w32/file.cxx | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | sal/systools/win32/uwinapi/makefile.mk | 21 |
3 files changed, 15 insertions, 12 deletions
diff --git a/sal/inc/osl/endian.h b/sal/inc/osl/endian.h index c9004bdab642..7eb0094d36db 100644 --- a/sal/inc/osl/endian.h +++ b/sal/inc/osl/endian.h @@ -40,6 +40,8 @@ extern "C" { #ifdef _WIN32 # if defined(_M_IX86) # define _LITTLE_ENDIAN +# elif defined(_M_AMD64) +# define _LITTLE_ENDIAN # elif defined(_M_MRX000) # define _LITTLE_ENDIAN # elif defined(_M_ALPHA) diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx index 678434acddc1..670e1c4fa174 100644 --- a/sal/osl/w32/file.cxx +++ b/sal/osl/w32/file.cxx @@ -425,7 +425,7 @@ oslFileError FileHandle_Impl::readFileAt ( return osl_File_E_None; } - SIZE_T const bytes = std::min(m_buflen - bufpos, nBytesRequested); + SIZE_T const bytes = std::min(m_buflen - bufpos, (SIZE_T) nBytesRequested); memcpy (&(buffer[*pBytesRead]), &(m_buffer[bufpos]), bytes); nBytesRequested -= bytes, *pBytesRead += bytes, nOffset += bytes; } @@ -495,7 +495,7 @@ oslFileError FileHandle_Impl::writeFileAt ( m_bufptr = bufptr, m_buflen = sal::static_int_cast< SIZE_T >(uDone); } - SIZE_T const bytes = std::min(m_bufsiz - bufpos, nBytesToWrite); + SIZE_T const bytes = std::min(m_bufsiz - bufpos, (SIZE_T) nBytesToWrite); memcpy (&(m_buffer[bufpos]), &(buffer[*pBytesWritten]), bytes); nBytesToWrite -= bytes, *pBytesWritten += bytes, nOffset += bytes; diff --git a/sal/systools/win32/uwinapi/makefile.mk b/sal/systools/win32/uwinapi/makefile.mk index 57faa5cf7d58..b086228b68d9 100755..100644 --- a/sal/systools/win32/uwinapi/makefile.mk +++ b/sal/systools/win32/uwinapi/makefile.mk @@ -47,14 +47,11 @@ CXXFLAGS+= $(LFS_CFLAGS) CFLAGSCXX+=-Wno-unused-parameter -Wno-return-type .ENDIF -.IF "$(COMEX)"=="9" -.IF "$(PSDK_HOME)"!="" -# Since the 02/2003 PSDK the "new" linker is needed here. -LINK=$(WRAPCMD) "$(PSDK_HOME)$/Bin$/Win64$/LINK.EXE" -.ENDIF -.ENDIF +SLOFILES= + +.IF "$(CPU)"=="I" -SLOFILES=\ +SLOFILES+=\ $(SLO)$/CheckTokenMembership.obj\ $(SLO)$/CommandLineToArgvW.obj\ $(SLO)$/CopyFileExA.obj\ @@ -79,8 +76,6 @@ SLOFILES=\ $(SLO)$/DllMain.obj\ $(SLO)$/ResolveThunk.obj\ $(SLO)$/ResolveUnicows.obj\ - $(SLO)$/snprintf.obj\ - $(SLO)$/snwprintf.obj\ $(SLO)$/FindFirstVolumeA.obj\ $(SLO)$/FindFirstVolumeW.obj\ $(SLO)$/FindNextVolumeA.obj\ @@ -111,7 +106,13 @@ SLOFILES=\ $(SLO)$/PathSetDlgItemPathW.obj\ $(SLO)$/PathStripToRootW.obj\ $(SLO)$/SHCreateItemFromParsingName.obj - + +.ENDIF + +SLOFILES+=\ + $(SLO)$/snprintf.obj\ + $(SLO)$/snwprintf.obj + SHL1TARGET=$(TARGET) SHL1IMPLIB=$(SHL1TARGET) SHL1DEF=$(MISC)/$(SHL1TARGET).def |