mirror of
https://github.com/debauchee/barrier.git
synced 2026-05-12 11:26:11 +08:00
Changes from mercurial repository.
This commit is contained in:
@@ -76,7 +76,7 @@ CStreamBuffer::pop(UInt32 n)
|
||||
ChunkList::iterator scan = m_chunks.begin();
|
||||
assert(scan != m_chunks.end());
|
||||
while (scan->size() - m_headUsed <= n) {
|
||||
n -= scan->size() - m_headUsed;
|
||||
n -= (UInt32)scan->size() - m_headUsed;
|
||||
m_headUsed = 0;
|
||||
scan = m_chunks.erase(scan);
|
||||
assert(scan != m_chunks.end());
|
||||
@@ -118,7 +118,7 @@ CStreamBuffer::write(const void* vdata, UInt32 n)
|
||||
while (n > 0) {
|
||||
// choose number of bytes for next chunk
|
||||
assert(scan->size() <= kChunkSize);
|
||||
UInt32 count = kChunkSize - scan->size();
|
||||
UInt32 count = kChunkSize - (UInt32)scan->size();
|
||||
if (count > n)
|
||||
count = n;
|
||||
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
# synergy -- mouse and keyboard sharing utility
|
||||
# Copyright (C) 2002 Chris Schoeneman
|
||||
#
|
||||
# This package is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# found in the file COPYING that should have accompanied this file.
|
||||
#
|
||||
# This package is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
## Process this file with automake to produce Makefile.in
|
||||
NULL =
|
||||
|
||||
EXTRA_DIST = \
|
||||
Makefile.win \
|
||||
$(NULL)
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
Makefile.in \
|
||||
$(NULL)
|
||||
|
||||
noinst_LIBRARIES = libio.a
|
||||
libio_a_SOURCES = \
|
||||
CStreamBuffer.cpp \
|
||||
CStreamFilter.cpp \
|
||||
IStream.cpp \
|
||||
XIO.cpp \
|
||||
CStreamBuffer.h \
|
||||
CStreamFilter.h \
|
||||
IStream.h \
|
||||
IStreamFilterFactory.h \
|
||||
XIO.h \
|
||||
$(NULL)
|
||||
INCLUDES = \
|
||||
-I$(top_srcdir)/lib/common \
|
||||
-I$(top_srcdir)/lib/arch \
|
||||
-I$(top_srcdir)/lib/base \
|
||||
-I$(top_srcdir)/lib/mt \
|
||||
$(NULL)
|
||||
@@ -1,63 +0,0 @@
|
||||
# synergy -- mouse and keyboard sharing utility
|
||||
# Copyright (C) 2007 Chris Schoeneman
|
||||
#
|
||||
# This package is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# found in the file COPYING that should have accompanied this file.
|
||||
#
|
||||
# This package is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
LIB_IO_SRC = lib\io
|
||||
LIB_IO_DST = $(BUILD_DST)\$(LIB_IO_SRC)
|
||||
LIB_IO_LIB = "$(LIB_IO_DST)\io.lib"
|
||||
LIB_IO_CPP = \
|
||||
"CStreamBuffer.cpp" \
|
||||
"CStreamFilter.cpp" \
|
||||
"IStream.cpp" \
|
||||
"XIO.cpp" \
|
||||
$(NULL)
|
||||
LIB_IO_OBJ = \
|
||||
"$(LIB_IO_DST)\CStreamBuffer.obj" \
|
||||
"$(LIB_IO_DST)\CStreamFilter.obj" \
|
||||
"$(LIB_IO_DST)\IStream.obj" \
|
||||
"$(LIB_IO_DST)\XIO.obj" \
|
||||
$(NULL)
|
||||
LIB_IO_INC = \
|
||||
/I"lib\common" \
|
||||
/I"lib\arch" \
|
||||
/I"lib\base" \
|
||||
/I"lib\mt" \
|
||||
$(NULL)
|
||||
|
||||
CPP_FILES = $(CPP_FILES) $(LIB_IO_CPP)
|
||||
OBJ_FILES = $(OBJ_FILES) $(LIB_IO_OBJ)
|
||||
LIB_FILES = $(LIB_FILES) $(LIB_IO_LIB)
|
||||
|
||||
# Dependency rules
|
||||
$(LIB_IO_OBJ): $(AUTODEP)
|
||||
!if EXIST($(LIB_IO_DST)\deps.mak)
|
||||
!include $(LIB_IO_DST)\deps.mak
|
||||
!endif
|
||||
|
||||
# Build rules. Use batch-mode rules if possible.
|
||||
!if DEFINED(_NMAKE_VER)
|
||||
{$(LIB_IO_SRC)\}.cpp{$(LIB_IO_DST)\}.obj::
|
||||
!else
|
||||
{$(LIB_IO_SRC)\}.cpp{$(LIB_IO_DST)\}.obj:
|
||||
!endif
|
||||
@$(ECHO) Compile in $(LIB_IO_SRC)
|
||||
-@$(MKDIR) $(LIB_IO_DST) 2>NUL:
|
||||
$(cpp) $(cppdebug) $(cppflags) $(cppvarsmt) /showIncludes \
|
||||
$(LIB_IO_INC) \
|
||||
/Fo$(LIB_IO_DST)\ \
|
||||
/Fd$(LIB_IO_LIB:.lib=.pdb) \
|
||||
$< | $(AUTODEP) $(LIB_IO_SRC) $(LIB_IO_DST)
|
||||
$(LIB_IO_LIB): $(LIB_IO_OBJ)
|
||||
@$(ECHO) Link $(@F)
|
||||
$(implib) $(ildebug) $(ilflags) \
|
||||
/out:$@ \
|
||||
$**
|
||||
$(AUTODEP) $(LIB_IO_SRC) $(LIB_IO_DST) $(**:.obj=.d)
|
||||
Reference in New Issue
Block a user