[Firebird-checkins] CVS: firebird2/src/jrd common.h, 1.162, 1.163 isc.h, 1.34, 1.35

[Dmitry Y. <di...@us...>]

Build Version :  T2.5.0.18450 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18610 2008/02/20 16:07:10 dimitr Exp  )

Update of /cvsroot/firebird/firebird2/src/jrd
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv31674

Modified Files:
	common.h isc.h 
Log Message:
Cleanup.

Index: common.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/common.h,v
retrieving revision 1.162
retrieving revision 1.163
diff -b -U3 -r1.162 -r1.163
--- common.h	3 Feb 2008 11:20:48 -0000	1.162
+++ common.h	20 Feb 2008 16:07:07 -0000	1.163
@@ -70,13 +70,11 @@
 #ifdef SUPERSERVER
 #define SWEEP_THREAD
 #define GARBAGE_THREAD
-#elif !defined(SUPERCLIENT)
-#define AST_THREAD
+#define CANCEL_OPERATION
 #endif
 
 
 #ifdef SUPERSERVER
-#define CANCEL_OPERATION
 #define FB_ARCHITECTURE isc_info_db_class_server_access
 #else
 #define FB_ARCHITECTURE isc_info_db_class_classic_access

Index: isc.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/isc.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -b -U3 -r1.34 -r1.35
--- isc.h	11 Feb 2008 17:34:58 -0000	1.34
+++ isc.h	20 Feb 2008 16:07:07 -0000	1.35
@@ -31,10 +31,6 @@
 #ifndef JRD_ISC_H
 #define JRD_ISC_H
 
-// For AST_THREAD
-#include "../jrd/common.h"
-#include "../jrd/sch_proto.h"
-
 // Firebird platform-specific synchronization data structures
 
 #ifdef UNIX