diff -urNad stable~/src/jrd/jrd.cpp stable/src/jrd/jrd.cpp --- stable~/src/jrd/jrd.cpp 2006-10-18 21:47:43.000000000 +0300 +++ stable/src/jrd/jrd.cpp 2006-10-18 21:47:43.000000000 +0300 @@ -135,14 +135,14 @@ #endif #ifdef SERVER_SHUTDOWN -extern "C" { +//extern "C" { typedef struct dbf { struct dbf *dbf_next; USHORT dbf_length; TEXT dbf_data[2]; } *DBF; -} // extern "C" +//} // extern "C" #include "../jrd/sort.h" #endif /* SERVER_SHUTDOWN */ @@ -159,9 +159,9 @@ /*TMN: fwd. decl. SHOULD BE IN A HEADER FILE*/ void ALL_print_memory_pool_info(IB_FILE * fptr, DBB databases); void ALLD_print_memory_pool_info(IB_FILE * fptr); -extern "C" { +//extern "C" { void gds_print_delta_counters(IB_FILE *); -} // extern "C" +//} // extern "C" #endif /* SUPERSERVER */ @@ -201,10 +201,10 @@ #ifdef SUPERSERVER -extern "C" { +//extern "C" { extern SLONG trace_pools; static REC_MUTX_T databases_rec_mutex; -} // extern "C" +//} // extern "C" // BRS. 03/23/2003 // Those empty defines was substituted with #if defined(V4_THREADING) && !defined(SUPERSERVER) @@ -289,7 +289,7 @@ return TRUE; } -extern "C" { +//extern "C" { #ifdef WIN_NT @@ -592,10 +592,10 @@ #ifdef SHLIB_DEFS -} // extern "C" +//} // extern "C" /** Use shdef.h which has all shared lib defs **/ #include "shdef.h" -extern "C" { +//extern "C" { #endif @@ -6620,4 +6620,4 @@ return true; } -} // extern "C" +//} // extern "C"