mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-22 16:43:03 +01:00
Move win32 specific sources in remote to remote/os/win32
This commit is contained in:
brodsom
parent
75a11bcaa5
commit
5829455596
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.client.util,v 1.9 2003-03-31 10:29:14 aafemt Exp $
|
||||
# $Id: Makefile.in.client.util,v 1.10 2003-07-14 23:21:39 brodsom Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleName=client.util
|
||||
@ -66,7 +66,7 @@ FBGUARD_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(FBGUARD_Sour
|
||||
IBGUARD_A_Files = cntl_guard.cpp iscguard.cpp
|
||||
IBGUARD_A_Sources = $(addprefix iscguard/, $(IBGUARD_A_Files))
|
||||
IBGUARD_A_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(IBGUARD_A_Sources))))
|
||||
IBGUARD_B_Files = chop.cpp
|
||||
IBGUARD_B_Files = os/win32/chop.cpp
|
||||
IBGUARD_B_Sources = $(addprefix remote/, $(IBGUARD_B_Files))
|
||||
IBGUARD_B_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(IBGUARD_B_Sources))))
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: make.shared.targets,v 1.14 2003-07-11 02:23:58 brodsom Exp $
|
||||
# $Id: make.shared.targets,v 1.15 2003-07-14 23:21:39 brodsom Exp $
|
||||
#
|
||||
|
||||
|
||||
@ -93,12 +93,12 @@ $(BLRTABLE): $(BLRTABLE_Objects)
|
||||
# Adding resources as prerequisite for some files
|
||||
|
||||
$(FilesToAddVersionInfo): $(GEN_ROOT)/jrd/version.res
|
||||
$(FilesToAddDialog): $(GEN_ROOT)/remote/window.res
|
||||
$(FilesToAddDialog): $(GEN_ROOT)/remote/os/win32/window.res
|
||||
|
||||
# Explicit dependence of resource script
|
||||
$(GEN_ROOT)/remote/window.res: $(SRC_ROOT)/remote/window.rc $(SRC_ROOT)/remote/window.rh \
|
||||
$(SRC_ROOT)/jrd/version.rc $(SRC_ROOT)/jrd/build_no.h $(SRC_ROOT)/remote/property.rc \
|
||||
$(SRC_ROOT)/remote/property.rh $(SRC_ROOT)/remote/ibconfig.rc
|
||||
$(GEN_ROOT)/remote/os/win32/window.res: $(SRC_ROOT)/remote/os/win32/window.rc $(SRC_ROOT)/remote/os/win32/window.rh \
|
||||
$(SRC_ROOT)/jrd/version.rc $(SRC_ROOT)/jrd/build_no.h $(SRC_ROOT)/remote/os/win32/property.rc \
|
||||
$(SRC_ROOT)/remote/os/win32/property.rh $(SRC_ROOT)/remote/os/win32/ibconfig.rc
|
||||
|
||||
.PHONY: clean FORCE
|
||||
|
||||
|
||||
@ -99,7 +99,7 @@ REMOTE_ClientFiles = allr.cpp inet.cpp interface.cpp merge.cpp \
|
||||
parser.cpp protocol.cpp remote.cpp xdr.cpp
|
||||
|
||||
ifeq ($(PLATFORM),win32)
|
||||
REMOTE_ClientFiles += wnet.cpp xnet.cpp
|
||||
REMOTE_ClientFiles += os/win32/wnet.cpp xnet.cpp
|
||||
endif
|
||||
|
||||
INTERFACE_Files= $(REMOTE_ClientFiles)
|
||||
|
||||
@ -25,7 +25,7 @@ JRDBOOT_Extra_Files=isc_sync.cpp thd.cpp
|
||||
|
||||
OS_SPECIFIC_Files=thd_priority.cpp
|
||||
|
||||
OS_ServerFiles=srvr_w32 window.cpp chop.cpp property.cpp ibconfig.cpp cntl.cpp
|
||||
OS_ServerFiles= os/win32/srvr_w32 os/win32/window.cpp os/win32/chop.cpp os/win32/property.cpp os/win32/ibconfig.cpp os/win32/cntl.cpp
|
||||
|
||||
LIB_LINK_OPTIONS:=-shared -Wl,--add-stdcall-alias
|
||||
LIB_LINK_RPATH:=-Wl,-rpath,
|
||||
|
||||
@ -109,15 +109,15 @@ SOURCE=..\..\..\src\utilities\ppg.cpp
|
||||
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\caution.ico
|
||||
SOURCE=..\..\..\src\remote\os\win32\caution.ico
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\server.ico
|
||||
SOURCE=..\..\..\src\remote\os\win32\server.ico
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\window.rc
|
||||
SOURCE=..\..\..\src\remote\os\win32\window.rc
|
||||
# End Source File
|
||||
# End Group
|
||||
# End Target
|
||||
|
||||
@ -272,7 +272,7 @@ SOURCE=..\..\..\src\remote\remote.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\wnet.cpp
|
||||
SOURCE=..\..\..\src\remote\os\win32\wnet.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
|
||||
@ -205,7 +205,7 @@ SOURCE=..\..\..\src\remote\remote.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\wnet.cpp
|
||||
SOURCE=..\..\..\src\remote\os\win32\wnet.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
|
||||
@ -229,7 +229,7 @@ SOURCE=..\..\..\src\remote\remote.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\wnet.cpp
|
||||
SOURCE=..\..\..\src\remote\os\win32\wnet.cpp
|
||||
|
||||
!IF "$(CFG)" == "fbembed - Win32 Release"
|
||||
|
||||
|
||||
@ -109,7 +109,7 @@ SOURCE=..\..\..\src\iscguard\iscguard.cpp
|
||||
# PROP Default_Filter ""
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\chop.cpp
|
||||
SOURCE=..\..\..\src\remote\os\win32\chop.cpp
|
||||
# End Source File
|
||||
# End Group
|
||||
# Begin Group "Header files"
|
||||
|
||||
@ -109,15 +109,15 @@ SOURCE=..\..\..\src\utilities\ppg.cpp
|
||||
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\caution.ico
|
||||
SOURCE=..\..\..\src\remote\os\win32\caution.ico
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\server.ico
|
||||
SOURCE=..\..\..\src\remote\os\win32\server.ico
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\window.rc
|
||||
SOURCE=..\..\..\src\remote\os\win32\window.rc
|
||||
# End Source File
|
||||
# End Group
|
||||
# End Target
|
||||
|
||||
@ -90,15 +90,15 @@ SOURCE=..\..\..\src\remote\allr.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\chop.cpp
|
||||
SOURCE=..\..\..\src\remote\os\win32\chop.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\cntl.cpp
|
||||
SOURCE=..\..\..\src\remote\os\win32\cntl.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\ibconfig.cpp
|
||||
SOURCE=..\..\..\src\remote\os\win32\ibconfig.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@ -118,7 +118,7 @@ SOURCE=..\..\..\src\remote\parser.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\property.cpp
|
||||
SOURCE=..\..\..\src\remote\os\win32\property.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@ -134,15 +134,15 @@ SOURCE=..\..\..\src\remote\server.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\srvr_w32.cpp
|
||||
SOURCE=..\..\..\src\remote\os\win32\srvr_w32.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\window.cpp
|
||||
SOURCE=..\..\..\src\remote\os\win32\window.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\wnet.cpp
|
||||
SOURCE=..\..\..\src\remote\os\win32\wnet.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@ -190,7 +190,7 @@ SOURCE=..\..\..\src\remote\spxnet32_proto.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\wnet_proto.h
|
||||
SOURCE=..\..\..\src\remote\os\win32\wnet_proto.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
|
||||
@ -90,15 +90,15 @@ SOURCE=..\..\..\src\remote\allr.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\chop.cpp
|
||||
SOURCE=..\..\..\src\remote\os\win32\chop.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\cntl.cpp
|
||||
SOURCE=..\..\..\src\remote\os\win32\cntl.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\ibconfig.cpp
|
||||
SOURCE=..\..\..\src\remote\os\win32\ibconfig.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@ -118,7 +118,7 @@ SOURCE=..\..\..\src\remote\parser.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\property.cpp
|
||||
SOURCE=..\..\..\src\remote\os\win32\property.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@ -134,15 +134,15 @@ SOURCE=..\..\..\src\remote\server.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\srvr_w32.cpp
|
||||
SOURCE=..\..\..\src\remote\os\win32\srvr_w32.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\window.cpp
|
||||
SOURCE=..\..\..\src\remote\os\win32\window.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\wnet.cpp
|
||||
SOURCE=..\..\..\src\remote\os\win32\wnet.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@ -186,7 +186,7 @@ SOURCE=..\..\..\src\remote\spxnet32_proto.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\remote\wnet_proto.h
|
||||
SOURCE=..\..\..\src\remote\os\win32\wnet_proto.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
|
||||
@ -148,13 +148,13 @@
|
||||
Name="Resource files"
|
||||
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\caution.ico">
|
||||
RelativePath="..\..\..\src\remote\os\win32\caution.ico">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\server.ico">
|
||||
RelativePath="..\..\..\src\remote\os\win32\server.ico">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\window.rc">
|
||||
RelativePath="..\..\..\src\remote\os\win32\window.rc">
|
||||
<FileConfiguration
|
||||
Name="Release|Win32">
|
||||
<Tool
|
||||
|
||||
@ -262,7 +262,7 @@
|
||||
RelativePath="..\..\..\src\remote\remote.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\wnet.cpp">
|
||||
RelativePath="..\..\..\src\remote\os\win32\wnet.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\xdr.cpp">
|
||||
|
||||
@ -210,7 +210,7 @@
|
||||
RelativePath="..\..\..\src\remote\remote.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\wnet.cpp">
|
||||
RelativePath="..\..\..\src\remote\os\win32\wnet.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\xdr.cpp">
|
||||
|
||||
@ -262,7 +262,7 @@
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\wnet.cpp">
|
||||
RelativePath="..\..\..\src\remote\os\win32\wnet.cpp">
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32">
|
||||
<Tool
|
||||
|
||||
@ -148,13 +148,13 @@
|
||||
Name="Resource files"
|
||||
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\caution.ico">
|
||||
RelativePath="..\..\..\src\remote\os\win32\caution.ico">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\server.ico">
|
||||
RelativePath="..\..\..\src\remote\os\win32\server.ico">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\window.rc">
|
||||
RelativePath="..\..\..\src\remote\os\win32\window.rc">
|
||||
<FileConfiguration
|
||||
Name="Release|Win32">
|
||||
<Tool
|
||||
|
||||
@ -112,13 +112,13 @@
|
||||
RelativePath="..\..\..\src\remote\allr.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\chop.cpp">
|
||||
RelativePath="..\..\..\src\remote\os\win32\chop.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\cntl.cpp">
|
||||
RelativePath="..\..\..\src\remote\os\win32\cntl.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\ibconfig.cpp">
|
||||
RelativePath="..\..\..\src\remote\os\win32\ibconfig.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\inet.cpp">
|
||||
@ -133,7 +133,7 @@
|
||||
RelativePath="..\..\..\src\remote\parser.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\property.cpp">
|
||||
RelativePath="..\..\..\src\remote\os\win32\property.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\protocol.cpp">
|
||||
@ -145,13 +145,13 @@
|
||||
RelativePath="..\..\..\src\remote\server.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\srvr_w32.cpp">
|
||||
RelativePath="..\..\..\src\remote\os\win32\srvr_w32.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\window.cpp">
|
||||
RelativePath="..\..\..\src\remote\os\win32\window.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\wnet.cpp">
|
||||
RelativePath="..\..\..\src\remote\os\win32\wnet.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\xdr.cpp">
|
||||
@ -188,7 +188,7 @@
|
||||
RelativePath="..\..\..\src\remote\spxnet32_proto.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\wnet_proto.h">
|
||||
RelativePath="..\..\..\src\remote\os\win32\wnet_proto.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\xdr.h">
|
||||
|
||||
@ -112,13 +112,13 @@
|
||||
RelativePath="..\..\..\src\remote\allr.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\chop.cpp">
|
||||
RelativePath="..\..\..\src\remote\os\win32\chop.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\cntl.cpp">
|
||||
RelativePath="..\..\..\src\remote\os\win32\cntl.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\ibconfig.cpp">
|
||||
RelativePath="..\..\..\src\remote\os\win32\ibconfig.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\inet.cpp">
|
||||
@ -133,7 +133,7 @@
|
||||
RelativePath="..\..\..\src\remote\parser.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\property.cpp">
|
||||
RelativePath="..\..\..\src\remote\os\win32\property.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\protocol.cpp">
|
||||
@ -145,13 +145,13 @@
|
||||
RelativePath="..\..\..\src\remote\server.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\srvr_w32.cpp">
|
||||
RelativePath="..\..\..\src\remote\os\win32\srvr_w32.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\window.cpp">
|
||||
RelativePath="..\..\..\src\remote\os\win32\window.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\wnet.cpp">
|
||||
RelativePath="..\..\..\src\remote\os\win32\wnet.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\xdr.cpp">
|
||||
@ -185,7 +185,7 @@
|
||||
RelativePath="..\..\..\src\remote\spxnet32_proto.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\wnet_proto.h">
|
||||
RelativePath="..\..\..\src\remote\os\win32\wnet_proto.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\remote\xdr.h">
|
||||
|
||||
18
configure.in
18
configure.in
@ -1,4 +1,4 @@
|
||||
dnl $Id: configure.in,v 1.147 2003-07-14 09:45:18 brodsom Exp $
|
||||
dnl $Id: configure.in,v 1.148 2003-07-14 23:20:24 brodsom Exp $
|
||||
|
||||
dnl ############################# INITIALISATION ###############################
|
||||
|
||||
@ -544,7 +544,7 @@ mkdir -p gen/utilities
|
||||
mkdir -p gen/examples
|
||||
|
||||
dnl # some .o and .d in this directory (to be removed)
|
||||
mkdir -p gen/remote
|
||||
mkdir -p gen/remote/os/win32
|
||||
|
||||
dnl # databases and output
|
||||
mkdir -p gen/refDatabases
|
||||
@ -574,7 +574,7 @@ mkdir -p temp/libfbserver/jrd
|
||||
mkdir -p temp/libfbserver/dsql
|
||||
mkdir -p temp/libfbserver/lock
|
||||
mkdir -p temp/libfbserver/misc
|
||||
mkdir -p temp/libfbserver/remote
|
||||
mkdir -p temp/libfbserver/remote/os/win32
|
||||
mkdir -p temp/libfbserver/pipe
|
||||
mkdir -p temp/libfbserver/gpre
|
||||
mkdir -p temp/libfbserver/alice
|
||||
@ -586,12 +586,12 @@ mkdir -p temp/libfbserver/common/classes
|
||||
mkdir -p temp/libfbserver/common/config
|
||||
mkdir -p temp/libfbserver/jrd/os/posix
|
||||
mkdir -p temp/libfbserver/jrd/os/win32
|
||||
mkdir -p temp/fbserver/remote
|
||||
mkdir -p temp/fbserver/remote/os/win32
|
||||
mkdir -p temp/fbserver/ipserver
|
||||
mkdir -p temp/libfbclient/jrd
|
||||
mkdir -p temp/libfbclient/dsql
|
||||
mkdir -p temp/libfbclient/gpre
|
||||
mkdir -p temp/libfbclient/remote
|
||||
mkdir -p temp/libfbclient/remote/os/win32
|
||||
mkdir -p temp/libfbclient/utilities
|
||||
mkdir -p temp/libfbclient/common/classes
|
||||
mkdir -p temp/libfbclient/common/config
|
||||
@ -604,7 +604,7 @@ mkdir -p temp/client.gdef/dudley
|
||||
mkdir -p temp/client.isql/isql
|
||||
mkdir -p temp/client.util/utilities
|
||||
mkdir -p temp/client.util/iscguard
|
||||
mkdir -p temp/client.util/remote
|
||||
mkdir -p temp/client.util/remote/os/win32
|
||||
mkdir -p temp/client.util/jrd/os/win32
|
||||
mkdir -p temp/intl/intl
|
||||
|
||||
@ -622,7 +622,7 @@ mkdir -p temp/libfbstatic/jrd
|
||||
mkdir -p temp/libfbstatic/dsql
|
||||
mkdir -p temp/libfbstatic/lock
|
||||
mkdir -p temp/libfbstatic/misc
|
||||
mkdir -p temp/libfbstatic/remote
|
||||
mkdir -p temp/libfbstatic/remote/os/win32
|
||||
mkdir -p temp/libfbstatic/gpre
|
||||
mkdir -p temp/libfbstatic/jrd/os/posix
|
||||
mkdir -p temp/libfbstatic/jrd/os/darwin
|
||||
@ -638,7 +638,7 @@ mkdir -p temp/embed.isql/isql
|
||||
mkdir -p temp/embed.gdef/dudley
|
||||
mkdir -p temp/embed.qli/qli
|
||||
mkdir -p temp/embed.gpre/gpre
|
||||
mkdir -p temp/inet_server/remote
|
||||
mkdir -p temp/inet_server/remote/os/win32
|
||||
mkdir -p temp/inet_server/ipserver
|
||||
mkdir -p temp/msgs/msgs
|
||||
mkdir -p temp/extlib/extlib
|
||||
@ -649,7 +649,7 @@ mkdir -p temp/libfbembed/jrd
|
||||
mkdir -p temp/libfbembed/dsql
|
||||
mkdir -p temp/libfbembed/lock
|
||||
mkdir -p temp/libfbembed/misc
|
||||
mkdir -p temp/libfbembed/remote
|
||||
mkdir -p temp/libfbembed/remote/os/win32
|
||||
mkdir -p temp/libfbembed/pipe
|
||||
mkdir -p temp/libfbembed/gpre
|
||||
mkdir -p temp/libfbembed/alice
|
||||
|
||||
@ -48,7 +48,7 @@
|
||||
#include "../jrd/isc_proto.h"
|
||||
#include "../jrd/isc_f_proto.h"
|
||||
#include "../jrd/sch_proto.h"
|
||||
#include "../remote/window.h"
|
||||
#include "../remote/os/win32/window.h"
|
||||
#include "../common/config/config.h"
|
||||
#define NO_PORT
|
||||
#include "../remote/xnet_proto.h"
|
||||
|
||||
@ -38,8 +38,8 @@
|
||||
#include "../iscguard/iscguard.h"
|
||||
#include "../iscguard/cntlg_proto.h"
|
||||
#include "../utilities/install_nt.h"
|
||||
#include "../remote/window.h"
|
||||
#include "../remote/chop_proto.h"
|
||||
#include "../remote/os/win32/window.h"
|
||||
#include "../remote/os/win32/chop_proto.h"
|
||||
#include "../common/config/config.h"
|
||||
|
||||
#ifdef WIN_NT
|
||||
|
||||
@ -71,7 +71,7 @@
|
||||
#if defined(WIN_NT)
|
||||
#define XNET
|
||||
#include "../jrd/isc_proto.h"
|
||||
#include "../remote/wnet_proto.h"
|
||||
#include "../remote/os/win32/wnet_proto.h"
|
||||
#include "../remote/xnet_proto.h"
|
||||
#endif
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 766 B After Width: | Height: | Size: 766 B |
@ -28,7 +28,7 @@
|
||||
#include "../jrd/os/thd_priority.h"
|
||||
#include "../jrd/thd.h"
|
||||
#include "../utilities/install_nt.h"
|
||||
#include "../remote/cntl_proto.h"
|
||||
#include "../remote/os/win32/cntl_proto.h"
|
||||
#include "../jrd/gds_proto.h"
|
||||
#include "../jrd/isc_proto.h"
|
||||
#include "../jrd/sch_proto.h"
|
||||
@ -38,16 +38,16 @@
|
||||
#include "../jrd/svc_undoc.h"
|
||||
#include "../jrd/svc_proto.h"
|
||||
#include "../jrd/ods.h" // to get MAX_PAGE_SIZE
|
||||
#include "../remote/window_proto.h"
|
||||
#include "../remote/os/win32/window_proto.h"
|
||||
#include "../ipserver/ipsrv_proto.h"
|
||||
|
||||
#include "../remote/ibconfig.h"
|
||||
#include "../remote/property.rh"
|
||||
#include "../remote/os/win32/ibconfig.h"
|
||||
#include "../remote/os/win32/property.rh"
|
||||
|
||||
#include "../jrd/y_ref.h"
|
||||
#include "../jrd/ibase.h"
|
||||
|
||||
#include "../remote/ibsvrhlp.h"
|
||||
#include "../remote/os/win32/ibsvrhlp.h"
|
||||
|
||||
#include "../common/config/config.h"
|
||||
|
||||
@ -90,22 +90,22 @@ static void FillSysdbaSPB(char *, char *);
|
||||
// where the first of each pair is the control ID,
|
||||
// and the second is the context ID for a help topic,
|
||||
// which is used in the help file.
|
||||
static DWORD aMenuHelpIDs1[] = {
|
||||
IDC_MODRES, ibs_modify, // This has to be the first entry because
|
||||
static DWORD aMenuHelpIDs1[][2] = {
|
||||
{IDC_MODRES, ibs_modify}, // This has to be the first entry because
|
||||
// we modify the value of ibs_modify to
|
||||
// ibs_reset when the button text changes.
|
||||
|
||||
IDC_MINSIZETEXT, ibs_min_process_work_set,
|
||||
IDC_MAXSIZETEXT, ibs_min_process_work_set,
|
||||
IDC_CACHETEXT, ibs_db_cache,
|
||||
IDC_DBPAGES, ibs_db_cache,
|
||||
IDC_MAPSIZE, ibs_client_map_size,
|
||||
IDC_MAPTEXT, ibs_client_map_size,
|
||||
IDC_MINSIZE, ibs_min_process_work_set,
|
||||
IDC_MAXSIZE, ibs_min_process_work_set,
|
||||
IDC_PRIORITYHIGH, ibs_process_priority,
|
||||
IDC_PRIORITYNORM, ibs_process_priority,
|
||||
0, 0
|
||||
{IDC_MINSIZETEXT, ibs_min_process_work_set},
|
||||
{IDC_MAXSIZETEXT, ibs_min_process_work_set},
|
||||
{IDC_CACHETEXT, ibs_db_cache},
|
||||
{IDC_DBPAGES, ibs_db_cache},
|
||||
{IDC_MAPSIZE, ibs_client_map_size},
|
||||
{IDC_MAPTEXT, ibs_client_map_size},
|
||||
{IDC_MINSIZE, ibs_min_process_work_set},
|
||||
{IDC_MAXSIZE, ibs_min_process_work_set},
|
||||
{IDC_PRIORITYHIGH, ibs_process_priority},
|
||||
{IDC_PRIORITYNORM, ibs_process_priority},
|
||||
{0, 0}
|
||||
};
|
||||
|
||||
// IB Parameters to get/set
|
||||
@ -272,7 +272,7 @@ LRESULT CALLBACK InterbasePage(HWND hDlg, UINT unMsg, WPARAM wParam,
|
||||
// the appropriate help topic based on whether the text
|
||||
// is "Modify..." or "Reset". It assumes that the first
|
||||
// entry is the first one.
|
||||
aMenuHelpIDs1[0, 1] = bModifyMode ? ibs_reset : ibs_modify;
|
||||
aMenuHelpIDs1[0][1] = bModifyMode ? ibs_reset : ibs_modify;
|
||||
break;
|
||||
}
|
||||
case PSN_APPLY: // When 'OK' or 'Apply Now' are clicked
|
||||
@ -382,7 +382,7 @@ BOOL ReadIBSettings(HWND hDlg)
|
||||
|
||||
// Select the right Map Size, inserting it if necessary
|
||||
wsprintf(pchTmp, "%d", lMapSize);
|
||||
if (SendDlgItemMessage(hDlg, IDC_MAPSIZE, CB_SELECTSTRING, -1,
|
||||
if (SendDlgItemMessage(hDlg, IDC_MAPSIZE, CB_SELECTSTRING, (unsigned int) -1,
|
||||
(LPARAM) pchTmp) == CB_ERR) {
|
||||
SendDlgItemMessage(hDlg, IDC_MAPSIZE, CB_ADDSTRING, 0,
|
||||
(LPARAM) pchTmp);
|
||||
@ -436,7 +436,7 @@ void RefreshIBControls(HWND hDlg, BOOL bEnable)
|
||||
// This modifies the bubble help table to bring up the appropriate help
|
||||
// topic based on whether the text is "Modify..." or "Reset". It assumes
|
||||
// that the first entry is the first one.
|
||||
aMenuHelpIDs1[0, 1] = bEnable ? ibs_reset : ibs_modify;
|
||||
aMenuHelpIDs1[0][1] = bEnable ? ibs_reset : ibs_modify;
|
||||
|
||||
}
|
||||
|
||||
@ -47,21 +47,21 @@
|
||||
#include "../jrd/isc.h"
|
||||
#include "../jrd/file_params.h"
|
||||
#include "../remote/remote_def.h"
|
||||
#include "../remote/window.rh"
|
||||
#include "../remote/property.rh"
|
||||
#include "../remote/os/win32/window.rh"
|
||||
#include "../remote/os/win32/property.rh"
|
||||
#include "../ipserver/ips.h"
|
||||
|
||||
#include "../jrd/svc_proto.h"
|
||||
#include "../remote/window_proto.h"
|
||||
#include "../remote/propty_proto.h"
|
||||
#include "../remote/os/win32/window_proto.h"
|
||||
#include "../remote/os/win32/propty_proto.h"
|
||||
#include "../ipserver/ipsrv_proto.h"
|
||||
#include "../remote/ibconfig.h"
|
||||
#include "../remote/os/win32/ibconfig.h"
|
||||
|
||||
#include "../jrd/y_ref.h"
|
||||
#include "../jrd/ibase.h"
|
||||
|
||||
#include "../remote/ibsvrhlp.h"
|
||||
#include "../remote/chop_proto.h"
|
||||
#include "../remote/os/win32/ibsvrhlp.h"
|
||||
#include "../remote/os/win32/chop_proto.h"
|
||||
|
||||
#include "../jrd/thd.h" /* get jrd_proto.h to declare the function */
|
||||
#include "../jrd/jrd_proto.h" /* JRD_num_attachments() */
|
||||
|
Before Width: | Height: | Size: 766 B After Width: | Height: | Size: 766 B |
@ -90,12 +90,12 @@
|
||||
#include "../jrd/thd.h"
|
||||
#include "../jrd/license.h"
|
||||
#include "../utilities/install_nt.h"
|
||||
#include "../remote/cntl_proto.h"
|
||||
#include "../remote/os/win32/cntl_proto.h"
|
||||
#include "../remote/inet_proto.h"
|
||||
#include "../remote/serve_proto.h"
|
||||
#include "../remote/window_proto.h"
|
||||
#include "../remote/wnet_proto.h"
|
||||
#include "../remote/window.rh"
|
||||
#include "../remote/os/win32/window_proto.h"
|
||||
#include "../remote/os/win32/wnet_proto.h"
|
||||
#include "../remote/os/win32/window.rh"
|
||||
#include "../remote/xnet_proto.h"
|
||||
#include "../jrd/gds_proto.h"
|
||||
#include "../jrd/license.h"
|
||||
@ -31,8 +31,8 @@
|
||||
#include "../jrd/isc.h"
|
||||
#include "../jrd/file_params.h"
|
||||
#include "../remote/remote_def.h"
|
||||
#include "../remote/window.rh"
|
||||
#include "../remote/property.rh"
|
||||
#include "../remote/os/win32/window.rh"
|
||||
#include "../remote/os/win32/property.rh"
|
||||
#include "../remote/xnet.h"
|
||||
#ifdef IPSERVER
|
||||
#include "../ipserver/ips.h"
|
||||
@ -41,14 +41,14 @@
|
||||
#include "../jrd/sch_proto.h"
|
||||
#include "../jrd/thd.h"
|
||||
#include "../jrd/jrd_proto.h"
|
||||
#include "../remote/window_proto.h"
|
||||
#include "../remote/propty_proto.h"
|
||||
#include "../remote/os/win32/window_proto.h"
|
||||
#include "../remote/os/win32/propty_proto.h"
|
||||
#ifdef IPSERVER
|
||||
#include "../ipserver/ipsrv_proto.h"
|
||||
#endif
|
||||
#include "../jrd/gds_proto.h"
|
||||
|
||||
#include "../remote/window.h"
|
||||
#include "../remote/os/win32/window.h"
|
||||
#include "../jrd/isc_proto.h"
|
||||
|
||||
#define NO_PORT
|
||||
@ -28,7 +28,7 @@ produced by Borland Resource Workshop
|
||||
|
||||
#include <windows.h>
|
||||
#include "window.rh"
|
||||
#include "../jrd/version.rc"
|
||||
#include "../../../jrd/version.rc"
|
||||
#include "property.rc"
|
||||
|
||||
STRINGTABLE
|
||||
@ -38,7 +38,7 @@
|
||||
|
||||
#include "../remote/proto_proto.h"
|
||||
#include "../remote/remot_proto.h"
|
||||
#include "../remote/wnet_proto.h"
|
||||
#include "../remote/os/win32/wnet_proto.h"
|
||||
#include "../jrd/gds_proto.h"
|
||||
#include "../jrd/isc_proto.h"
|
||||
#include "../jrd/isc_f_proto.h"
|
||||
@ -43,7 +43,7 @@
|
||||
#include "../remote/remot_proto.h"
|
||||
#include "../remote/serve_proto.h"
|
||||
#ifdef WIN_NT
|
||||
#include "../remote/cntl_proto.h"
|
||||
#include "../remote/os/win32/cntl_proto.h"
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
#include "../jrd/gds_proto.h"
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
#include "../remote/proto_proto.h"
|
||||
#include "../remote/remot_proto.h"
|
||||
#include "../remote/xnet_proto.h"
|
||||
#include "../remote/window.h"
|
||||
#include "../remote/os/win32/window.h"
|
||||
#include "../jrd/gds_proto.h"
|
||||
#include "../jrd/isc_proto.h"
|
||||
#include "../jrd/isc_f_proto.h"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user