firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 23:23:04 +01:00
Code Issues

-Add IPSERVER define to window.cpp, now it is possible to do a server build without ipserver.

Browse Source 
-Add SERVER_SHUTDOWN define to window.cpp.
-Move the setting of SERVER_SHUTDOWN when SUPERSERVER to firebird.h, previously a SUPERSERVER build fail if SERVER_SHUTDOWN is not defined in the command line.
This commit is contained in:
brodsom 2003-03-01 18:15:43 +00:00
parent a860803dc1
commit 40df76418a
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/include/firebird.h
View File

@ -30,7 +30,7 @@
* John Bellardo <bellardo@cs.ucsd.edu> * John Bellardo <bellardo@cs.ucsd.edu>
* *
* *
* $Id: firebird.h,v 1.9 2003-02-27 21:34:40 brodsom Exp $ * $Id: firebird.h,v 1.10 2003-03-01 18:15:43 brodsom Exp $
* *
*/ */
@ -60,4 +60,9 @@
#include "fb_exception.h" #include "fb_exception.h"
#endif #endif
//
#ifdef SUPERSERVER
#define SERVER_SHUTDOWN 1
#endif
#endif /* INCLUDE_Firebird */ #endif /* INCLUDE_Firebird */

5
src/jrd/thd.h
View File

@ -26,7 +26,7 @@
* *
*/ */
/* /*
$Id: thd.h,v 1.10 2002-10-30 06:40:49 seanleyne Exp $ $Id: thd.h,v 1.11 2003-03-01 18:15:42 brodsom Exp $
*/ */
#ifndef _JRD_THD_H_ #ifndef _JRD_THD_H_
@ -108,9 +108,6 @@ struct IB_RTL_CRITICAL_SECTION
}; };
#endif #endif
#ifdef SUPERSERVER
#define SERVER_SHUTDOWN 1
#endif
#ifdef MULTI_THREAD #ifdef MULTI_THREAD
#define ANY_THREADING 1 #define ANY_THREADING 1

19
src/remote/window.cpp
View File

@ -34,16 +34,18 @@
#include "../remote/window.rh" #include "../remote/window.rh"
#include "../remote/property.rh" #include "../remote/property.rh"
#include "../remote/xnet.h" #include "../remote/xnet.h"
#ifdef IPSERVER
#include "../ipserver/ips.h" #include "../ipserver/ips.h"
#endif
#include "../jrd/svc_proto.h" #include "../jrd/svc_proto.h"
#include "../jrd/sch_proto.h" #include "../jrd/sch_proto.h"
#include "../jrd/thd.h" #include "../jrd/thd.h"
#include "../jrd/jrd_proto.h" #include "../jrd/jrd_proto.h"
#include "../remote/window_proto.h" #include "../remote/window_proto.h"
#include "../remote/propty_proto.h" #include "../remote/propty_proto.h"
#ifdef IPSERVER
#include "../ipserver/ipsrv_proto.h" #include "../ipserver/ipsrv_proto.h"
#endif
#include "../jrd/gds_proto.h" #include "../jrd/gds_proto.h"
#include "../remote/window.h" #include "../remote/window.h"
@ -117,7 +119,7 @@ int WINDOW_main( HINSTANCE hThisInst, int nWndMode, USHORT usServerFlagMask)
szClassName = "FB_Disabled"; szClassName = "FB_Disabled";
} }
else { else {
#ifdef IPSERVER
if (!IPS_init(hWnd, 0, (USHORT) Config::getIpcMapSize(), 0)) { if (!IPS_init(hWnd, 0, (USHORT) Config::getIpcMapSize(), 0)) {
// The initialization failed. Check to see if there is another // The initialization failed. Check to see if there is another
// server running. If so, bring up it's property sheet and quit // server running. If so, bring up it's property sheet and quit
@ -145,7 +147,7 @@ int WINDOW_main( HINSTANCE hThisInst, int nWndMode, USHORT usServerFlagMask)
} }
return 0; return 0;
} }
#endif
if (!XNET_init(hWnd, 0, 0, 0)) { if (!XNET_init(hWnd, 0, 0, 0)) {
char szMsgString[TMP_STRINGLEN]; char szMsgString[TMP_STRINGLEN];
hWnd = FindWindow(szClassName, APP_NAME); hWnd = FindWindow(szClassName, APP_NAME);
@ -202,9 +204,9 @@ int WINDOW_main( HINSTANCE hThisInst, int nWndMode, USHORT usServerFlagMask)
CW_USEDEFAULT, CW_USEDEFAULT,
APP_HSIZE, APP_HSIZE,
APP_VSIZE, HWND_DESKTOP, NULL, hInstance, NULL); APP_VSIZE, HWND_DESKTOP, NULL, hInstance, NULL);
#ifdef SERVER_SHUTDOWN
SVC_shutdown_init(WINDOW_shutdown, (ULONG) hWnd); SVC_shutdown_init(WINDOW_shutdown, (ULONG) hWnd);
#endif
// Do the proper ShowWindow depending on if the app is an icon on // Do the proper ShowWindow depending on if the app is an icon on
// the desktop, or in the task bar. // the desktop, or in the task bar.
@ -464,6 +466,7 @@ LRESULT CALLBACK WindowFunc(HWND hWnd,
else else
SetFocus(hPSDlg); SetFocus(hPSDlg);
return TRUE; return TRUE;
} }
return DefWindowProc(hWnd, message, wParam, lParam); return DefWindowProc(hWnd, message, wParam, lParam);
@ -481,10 +484,10 @@ LRESULT CALLBACK WindowFunc(HWND hWnd,
PostQuitMessage(0); PostQuitMessage(0);
break; break;
#ifdef IPSERVER
case IPI_CONNECT_MESSAGE: case IPI_CONNECT_MESSAGE:
return IPS_start_thread(lParam); return IPS_start_thread(lParam);
#endif
case XPI_CONNECT_MESSAGE: case XPI_CONNECT_MESSAGE:
return SRVR_xnet_start_thread(lParam); return SRVR_xnet_start_thread(lParam);