8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 00:03:02 +01:00

ipserver is being deleted. Update source files.

This commit is contained in:
robocop 2004-10-03 07:04:44 +00:00
parent 155269a214
commit 273665c953
4 changed files with 2 additions and 46 deletions

View File

@ -30,13 +30,11 @@
#include "../jrd/common.h"
#include "../jrd/isc.h"
#include "../jrd/file_params.h"
#include "../ipserver/ips.h"
#include "../jrd/svc_undoc.h"
#include "../jrd/svc_proto.h"
#include "../jrd/ods.h" // to get MAX_PAGE_SIZE
#include "../remote/os/win32/window_proto.h"
#include "../ipserver/ipsrv_proto.h"
#include "../remote/os/win32/ibconfig.h"
#include "../remote/os/win32/property.rh"

View File

@ -46,12 +46,10 @@
#include "../remote/remote_def.h"
#include "../remote/os/win32/window.rh"
#include "../remote/os/win32/property.rh"
#include "../ipserver/ips.h"
#include "../jrd/svc_proto.h"
#include "../remote/os/win32/window_proto.h"
#include "../remote/os/win32/propty_proto.h"
#include "../ipserver/ipsrv_proto.h"
#include "../remote/os/win32/ibconfig.h"
#include "../jrd/ibase.h"

View File

@ -30,9 +30,7 @@
#include "../remote/remote_def.h"
#include "../remote/os/win32/window.rh"
#include "../remote/os/win32/property.rh"
#ifdef IPSERVER
#include "../ipserver/ips.h"
#endif
#include "../jrd/svc_proto.h"
#include "../jrd/sch_proto.h"
#include "../jrd/thd.h"
@ -40,9 +38,6 @@
#include "../jrd/jrd_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/os/win32/window.h"
@ -100,37 +95,6 @@ int WINDOW_main( HINSTANCE hThisInst, int nWndMode, USHORT usServerFlagMask)
if (!(usServerFlagMask & SRVR_ipc)) {
szClassName = "FB_Disabled";
}
else {
#ifdef IPSERVER
if (!IPS_init(hWnd, 0, (USHORT) Config::getIpcMapSize(), 0)) {
// The initialization failed. Check to see if there is another
// server running. If so, bring up it's property sheet and quit
// otherwise assume that a stale client is still around and tell
// the user to terminate it.
char szMsgString[TMP_STRINGLEN];
hWnd = FindWindow(szClassName, APP_NAME);
if (hWnd) {
LoadString(hInstance, IDS_ALREADYSTARTED, szMsgString,
TMP_STRINGLEN);
if (usServerFlagMask & SRVR_non_service) {
MessageBox(NULL, szMsgString, APP_LABEL,
MB_OK | MB_ICONHAND);
}
gds__log(szMsgString);
}
else {
LoadString(hInstance, IDS_MAPERROR, szMsgString,
TMP_STRINGLEN);
if (usServerFlagMask & SRVR_non_service) {
MessageBox(NULL, szMsgString, APP_LABEL,
MB_OK | MB_ICONHAND);
}
gds__log(szMsgString);
}
return 0;
}
#endif
}
/* initialize main window */
WNDCLASS wcl;
@ -444,10 +408,6 @@ LRESULT CALLBACK WindowFunc(HWND hWnd,
PostQuitMessage(0);
break;
#ifdef IPSERVER
case IPI_CONNECT_MESSAGE:
return IPS_start_thread(lParam);
#endif
case WM_DEVICECHANGE:
pdbcv = (PDEV_BROADCAST_VOLUME) lParam;

View File

@ -333,7 +333,7 @@ enum rem_port_t
port_pipe, /* Windows NT named pipe connection */
port_mslan, /* Microsoft LanManager connection */
port_spx, /* Novell SPX connection */
port_ipserver, /* InterBase interprocess server */
//port_ipserver, // InterBase interprocess server
port_xnet /* Windows NT named xnet connection */
};