diff --git a/src/burp/burp.cpp b/src/burp/burp.cpp
index 66965b8b9e..8fe883e36f 100644
--- a/src/burp/burp.cpp
+++ b/src/burp/burp.cpp
@@ -2062,7 +2062,7 @@ static void burp_output( const SCHAR* format, ...)
 							   (UCHAR*)(""));
 	}
 	else if (tdgbl->sw_redirect == REDIRECT && tdgbl->output_file != NULL) {
-		VA_START(arglist, format);
+		va_start(arglist, format);
 		vfprintf(tdgbl->output_file, format, arglist);
 		va_end(arglist);
 		exit_code =
@@ -2070,7 +2070,7 @@ static void burp_output( const SCHAR* format, ...)
 							   (UCHAR*)(""));
 	}
 	else {
-		VA_START(arglist, format);
+		va_start(arglist, format);
 		vsprintf((char *) buf, format, arglist);
 		va_end(arglist);
 
diff --git a/src/dsql/array.epp b/src/dsql/array.epp
index 51b4956553..da83bd1069 100644
--- a/src/dsql/array.epp
+++ b/src/dsql/array.epp
@@ -397,7 +397,7 @@ static ISC_STATUS error( ISC_STATUS* status, SSHORT count, ...)
 	ISC_STATUS* stat;
 	va_list ptr;
 
-	VA_START(ptr, count);
+	va_start(ptr, count);
 	stat = status;
 	*stat++ = isc_arg_gds;
 
@@ -622,7 +622,7 @@ static ISC_STATUS stuff_args(gen_t* gen, SSHORT count, ...)
 		gen->gen_end = new_sdl + new_len;
 	}
 
-	VA_START(ptr, count);
+	va_start(ptr, count);
 
 	for (; count; --count) {
 		c = va_arg(ptr, int);
diff --git a/src/dsql/blob.epp b/src/dsql/blob.epp
index efa54cc265..84f74fb7e7 100644
--- a/src/dsql/blob.epp
+++ b/src/dsql/blob.epp
@@ -292,7 +292,7 @@ static ISC_STATUS error( ISC_STATUS* status, SSHORT count, ...)
 	ISC_STATUS *stat;
 	va_list ptr;
 
-	VA_START(ptr, count);
+	va_start(ptr, count);
 	stat = status;
 	*stat++ = isc_arg_gds;
 
diff --git a/src/dsql/errd.cpp b/src/dsql/errd.cpp
index 24d061e1f0..d392618d13 100644
--- a/src/dsql/errd.cpp
+++ b/src/dsql/errd.cpp
@@ -164,7 +164,7 @@ bool ERRD_post_warning(ISC_STATUS status, ...)
 // meaning; if sizeof(long) != sizeof(void*), this code WILL crash something.
 
 
-	VA_START(args, status);
+	va_start(args, status);
 
 	ISC_STATUS* status_vector = ((tsql*) DSQL_get_thread_data())->tsql_status;
 	int indx = 0;
diff --git a/src/dsql/parse.cpp b/src/dsql/parse.cpp
index c144fed468..e3074c202b 100644
--- a/src/dsql/parse.cpp
+++ b/src/dsql/parse.cpp
@@ -9244,7 +9244,7 @@ static dsql_nod* make_node (NOD_TYPE	type,
 	node->nod_count = count;
 	dsql_nod** p = node->nod_arg;
 	va_list	ptr;
-	VA_START (ptr, count);
+	va_start (ptr, count);
 
 	while (--count >= 0)
 		*p++ = va_arg (ptr, dsql_nod*);
@@ -9278,7 +9278,7 @@ static dsql_nod* make_flag_node (NOD_TYPE	type,
 	node->nod_count = count;
 	dsql_nod** p = node->nod_arg;
 	va_list	ptr;
-	VA_START (ptr, count);
+	va_start (ptr, count);
 
 	while (--count >= 0)
 		*p++ = va_arg (ptr, dsql_nod*);
diff --git a/src/dsql/parse.y b/src/dsql/parse.y
index a47e8c8ebd..e7facedf3f 100644
--- a/src/dsql/parse.y
+++ b/src/dsql/parse.y
@@ -4446,7 +4446,7 @@ static dsql_nod* make_node (NOD_TYPE	type,
 	node->nod_count = count;
 	dsql_nod** p = node->nod_arg;
 	va_list	ptr;
-	VA_START (ptr, count);
+	va_start (ptr, count);
 
 	while (--count >= 0)
 		*p++ = va_arg (ptr, dsql_nod*);
@@ -4480,7 +4480,7 @@ static dsql_nod* make_flag_node (NOD_TYPE	type,
 	node->nod_count = count;
 	dsql_nod** p = node->nod_arg;
 	va_list	ptr;
-	VA_START (ptr, count);
+	va_start (ptr, count);
 
 	while (--count >= 0)
 		*p++ = va_arg (ptr, dsql_nod*);
diff --git a/src/dsql/user_dsql.cpp b/src/dsql/user_dsql.cpp
index 288934ae16..aec4db62ce 100644
--- a/src/dsql/user_dsql.cpp
+++ b/src/dsql/user_dsql.cpp
@@ -1437,7 +1437,7 @@ static void error_post(ISC_STATUS status, ...)
 /* Get the addresses of the argument vector and the status vector, and do
    word-wise copy. */
 
-	VA_START(args, status);
+	va_start(args, status);
 	p = UDSQL_error->dsql_status;
 
 // Copy first argument 
diff --git a/src/gpre/ada.cpp b/src/gpre/ada.cpp
index 90462dbab8..361b6bebbe 100644
--- a/src/gpre/ada.cpp
+++ b/src/gpre/ada.cpp
@@ -24,7 +24,7 @@
 //
 //____________________________________________________________
 //
-//	$Id: ada.cpp,v 1.40 2004-05-13 09:46:00 brodsom Exp $
+//	$Id: ada.cpp,v 1.41 2004-05-23 23:24:41 brodsom Exp $
 //
 
 #include "firebird.h"
@@ -3652,7 +3652,7 @@ static void printa( int column, const TEXT* string, ...)
 {
 	va_list ptr;
 
-	VA_START(ptr, string);
+	va_start(ptr, string);
 	align(column);
 	vsprintf(output_buffer, string, ptr);
 	ADA_print_buffer(output_buffer, column);
diff --git a/src/gpre/c_cxx.cpp b/src/gpre/c_cxx.cpp
index bdbca9ae06..de5768fe73 100644
--- a/src/gpre/c_cxx.cpp
+++ b/src/gpre/c_cxx.cpp
@@ -27,7 +27,7 @@
 //
 //____________________________________________________________
 //
-//	$Id: c_cxx.cpp,v 1.47 2004-05-13 22:34:27 brodsom Exp $
+//	$Id: c_cxx.cpp,v 1.48 2004-05-23 23:24:41 brodsom Exp $
 //
 
 #include "firebird.h"
@@ -3861,7 +3861,7 @@ static void printa( int column, const char* string, ...)
 {
 	va_list ptr;
 
-	VA_START(ptr, string);
+	va_start(ptr, string);
 	align(column);
 	vfprintf(out_file, string, ptr);
 }
@@ -3876,7 +3876,7 @@ static void printb( const TEXT* string, ...)
 {
 	va_list ptr;
 
-	VA_START(ptr, string);
+	va_start(ptr, string);
 	vfprintf(out_file, string, ptr);
 }
 
diff --git a/src/gpre/cob.cpp b/src/gpre/cob.cpp
index 94e75e255b..3db744e4e8 100644
--- a/src/gpre/cob.cpp
+++ b/src/gpre/cob.cpp
@@ -27,7 +27,7 @@
 //
 //____________________________________________________________
 //
-//	$Id: cob.cpp,v 1.42 2004-05-12 19:34:42 brodsom Exp $
+//	$Id: cob.cpp,v 1.43 2004-05-23 23:24:41 brodsom Exp $
 //
 // 2002.10.27 Sean Leyne - Completed removal of obsolete "DG_X86" port
 // 2002.10.27 Sean Leyne - Code Cleanup, removed obsolete "UNIXWARE" port
@@ -4409,7 +4409,7 @@ static void printa(const TEXT* column,
 	va_list ptr;
 	TEXT s[256];
 
-	VA_START(ptr, string);
+	va_start(ptr, string);
 	strcpy(s, column);
 	strcat(s, string);
 	strcat(s, "\n");
@@ -4428,7 +4428,7 @@ static void printb(const TEXT* string, ...)
 {
 	va_list ptr;
 
-	VA_START(ptr, string);
+	va_start(ptr, string);
 	vfprintf(out_file, string, ptr);
 }
 #endif
diff --git a/src/gpre/ftn.cpp b/src/gpre/ftn.cpp
index bde6400062..c51c1613ad 100644
--- a/src/gpre/ftn.cpp
+++ b/src/gpre/ftn.cpp
@@ -24,7 +24,7 @@
 //
 //____________________________________________________________
 //
-//	$Id: ftn.cpp,v 1.44 2004-05-13 09:46:01 brodsom Exp $
+//	$Id: ftn.cpp,v 1.45 2004-05-23 23:24:41 brodsom Exp $
 //
 // 2002.10.28 Sean Leyne - Completed removal of obsolete "DGUX" port
 // 2002.10.28 Sean Leyne - Completed removal of obsolete "SGI" port
@@ -4001,7 +4001,7 @@ static void printa(const TEXT* column, const TEXT* string, ...)
 	va_list ptr;
 	SCHAR s[256];
 
-	VA_START(ptr, string);
+	va_start(ptr, string);
 	strcpy(s, column);
 	strcat(s, string);
 	strcat(s, "\n");
@@ -4346,7 +4346,7 @@ static void printb(const TEXT* string, ...)
 {
 	va_list ptr;
 
-	VA_START(ptr, string);
+	va_start(ptr, string);
 	vfprintf(out_file, string, ptr);
 }
 #endif
diff --git a/src/gpre/int_cxx.cpp b/src/gpre/int_cxx.cpp
index 79108d088b..86edc942f8 100644
--- a/src/gpre/int_cxx.cpp
+++ b/src/gpre/int_cxx.cpp
@@ -25,7 +25,7 @@
 //
 //____________________________________________________________
 //
-//	$Id: int_cxx.cpp,v 1.33 2004-05-02 23:04:17 skidder Exp $
+//	$Id: int_cxx.cpp,v 1.34 2004-05-23 23:24:42 brodsom Exp $
 //
 
 #include "firebird.h"
@@ -743,7 +743,7 @@ static void printa(const int column, const TEXT* string, ...)
 {
 	va_list ptr;
 
-	VA_START(ptr, string);
+	va_start(ptr, string);
 	align(column);
 	vfprintf(out_file, string, ptr);
 }
diff --git a/src/gpre/pas.cpp b/src/gpre/pas.cpp
index 7f8a6aefc3..4354b22f92 100644
--- a/src/gpre/pas.cpp
+++ b/src/gpre/pas.cpp
@@ -24,7 +24,7 @@
 //
 //____________________________________________________________
 //
-//	$Id: pas.cpp,v 1.37 2004-05-02 23:04:17 skidder Exp $
+//	$Id: pas.cpp,v 1.38 2004-05-23 23:24:42 brodsom Exp $
 //
 
 #include "firebird.h"
@@ -3588,7 +3588,7 @@ static void printa( int column, const char* string, ...)
 {
 	va_list ptr;
 
-	VA_START(ptr, string);
+	va_start(ptr, string);
 	align(column);
 	vfprintf(out_file, string, ptr);
 }
diff --git a/src/gpre/pretty.cpp b/src/gpre/pretty.cpp
index e3f4ea98b1..7483249b69 100644
--- a/src/gpre/pretty.cpp
+++ b/src/gpre/pretty.cpp
@@ -25,7 +25,7 @@
 //
 //____________________________________________________________
 //
-//	$Id: pretty.cpp,v 1.25 2004-05-18 21:54:56 brodsom Exp $
+//	$Id: pretty.cpp,v 1.26 2004-05-23 23:24:42 brodsom Exp $
 //
 
 #include "firebird.h"
@@ -273,7 +273,7 @@ static int blr_format(CTL control, const char *string, ...)
 {
 	va_list ptr;
 
-	VA_START(ptr, string);
+	va_start(ptr, string);
 	vsprintf(control->ctl_ptr, string, ptr);
 	while (*control->ctl_ptr)
 		control->ctl_ptr++;
diff --git a/src/ipserver/ipclient.cpp b/src/ipserver/ipclient.cpp
index a17c1d3b0b..0255609ae4 100644
--- a/src/ipserver/ipclient.cpp
+++ b/src/ipserver/ipclient.cpp
@@ -3260,7 +3260,7 @@ ISC_STATUS GDS_START_TRANSACTION(ISC_STATUS * user_status,
 
 	// point to communications area 
 
-	VA_START(args, count);
+	va_start(args, count);
 	idb = *(va_arg(args, IDB *));
 	CHECK_HANDLE(idb, type_idb, isc_bad_db_handle);
 	GET_OBJECT(idb->idb_thread);
diff --git a/src/jrd/alt.cpp b/src/jrd/alt.cpp
index 00b7c772e5..648feb47fe 100644
--- a/src/jrd/alt.cpp
+++ b/src/jrd/alt.cpp
@@ -73,7 +73,7 @@ SLONG API_ROUTINE_VARARG isc_event_block(SCHAR** event_buffer,
  **************************************/
 	va_list ptr;
 
-	VA_START(ptr, count);
+	va_start(ptr, count);
 
 /* calculate length of event parameter block, 
    setting initial length to include version
@@ -108,7 +108,7 @@ SLONG API_ROUTINE_VARARG isc_event_block(SCHAR** event_buffer,
 
 	*p++ = EPB_version1;
 
-	VA_START(ptr, count);
+	va_start(ptr, count);
 
 	i = count;
 	while (i--) {
@@ -261,7 +261,7 @@ struct teb_t {
 	}
 
 	const teb_t* const end = teb + count;
-	VA_START(ptr, count);
+	va_start(ptr, count);
 
 	for (teb_t* teb_iter = teb; teb_iter < end; ++teb_iter) {
 		teb_iter->teb_database = va_arg(ptr, FB_API_HANDLE*);
diff --git a/src/jrd/btn.h b/src/jrd/btn.h
index cde62b7527..02684938d8 100644
--- a/src/jrd/btn.h
+++ b/src/jrd/btn.h
@@ -24,8 +24,8 @@
  *  Contributor(s): ______________________________________.
  */
 
-#ifndef JRD_BTN_H_
-#define JRD_BTN_H_
+#ifndef JRD_BTN_H
+#define JRD_BTN_H
 
 #include "firebird.h"			// needed for get_long
 #include "memory_routines.h"	// needed for get_long
@@ -110,5 +110,5 @@ namespace BTreeNode {
 
 } // namespace BTreeNode
 
-#endif // JRD_BTN_H_
+#endif // JRD_BTN_H
 
diff --git a/src/jrd/common.h b/src/jrd/common.h
index c4a1046e7e..4c673e4009 100644
--- a/src/jrd/common.h
+++ b/src/jrd/common.h
@@ -49,7 +49,7 @@
  *
  */
 /*
-$Id: common.h,v 1.117 2004-05-20 23:04:44 skidder Exp $
+$Id: common.h,v 1.118 2004-05-23 23:26:30 brodsom Exp $
 */
 
 #ifndef JRD_COMMON_H
@@ -110,9 +110,8 @@ $Id: common.h,v 1.117 2004-05-20 23:04:44 skidder Exp $
 #define SET_TCP_NO_DELAY
 #endif
 
-#define KILLER_SIGNALS
+//#define KILLER_SIGNALS
 
-#define VA_START(list,parmN)    va_start (list, parmN)
 #define UNIX
 #define IEEE
 
@@ -219,9 +218,8 @@ static inline int sinixz_sigaction(int sig, const struct sinixz_sigaction *act,
 #define SET_TCP_NO_DELAY
 #endif
 
-#define KILLER_SIGNALS
+//#define KILLER_SIGNALS
 
-#define VA_START(list,parmN)    va_start (list, parmN)
 #define UNIX
 #define IEEE
 
@@ -269,7 +267,7 @@ static inline int sinixz_sigaction(int sig, const struct sinixz_sigaction *act,
 
 //#define ALIGNMENT       4
 //#define DOUBLE_ALIGN    4
-#define BSD_UNIX
+//#define BSD_UNIX
 #define UNIX
 #define IMPLEMENTATION  63
 #define IEEE
@@ -307,7 +305,7 @@ static inline int sinixz_sigaction(int sig, const struct sinixz_sigaction *act,
 
 #define QUADFORMAT "ll"
 #define QUADCONST(n) (n##LL)
-#define KILLER_SIGNALS
+//#define KILLER_SIGNALS
 #define NO_NFS					/* no MTAB_OPEN or MTAB_CLOSE in isc_file.c */
 
 #define MEMMOVE(from,to,length)     memmove ((void *)to, (void *)from, (size_t) length)
@@ -338,7 +336,7 @@ static inline int sinixz_sigaction(int sig, const struct sinixz_sigaction *act,
 
 #define UNIX
 
-#define KILLER_SIGNALS
+//#define KILLER_SIGNALS
 #define NO_NFS					/* no MTAB_OPEN or MTAB_CLOSE in isc_file.c */
 
 #define MEMMOVE(from,to,length)     memmove ((void *)(to), (void *)(from), (size_t) length)
@@ -359,7 +357,7 @@ static inline int sinixz_sigaction(int sig, const struct sinixz_sigaction *act,
  * using pipe server.
  * 1995-February-24 David Schnepper
  */
-#define KILLER_SIGNALS
+//#define KILLER_SIGNALS
 
 #ifdef SOLARIS
 
@@ -421,9 +419,9 @@ static inline int sinixz_sigaction(int sig, const struct sinixz_sigaction *act,
    which is too large to fit in a long int. */
 #define QUADCONST(n) (n##LL)
 
-#else /* SOLARIS */
+//#else /* SOLARIS */
 
-#define BSD_UNIX
+//#define BSD_UNIX
 
 #endif /* SOLARIS */
 
@@ -462,9 +460,9 @@ static inline int sinixz_sigaction(int sig, const struct sinixz_sigaction *act,
 #define hpux
 #endif
 
-#define KILLER_SIGNALS
+//#define KILLER_SIGNALS
 #define UNIX
-#define CURSES_KEYPAD
+//#define CURSES_KEYPAD
 
 //#define ALIGNMENT       8
 //#define DOUBLE_ALIGN    8
@@ -529,9 +527,9 @@ typedef unsigned int64 UATOM;
 #ifdef _AIX						/* IBM AIX */
 #ifndef _POWER					/* IBM RS/6000 */
 #define AIX
-#define KILLER_SIGNALS
+//#define KILLER_SIGNALS
 #define UNIX
-#define CURSES_KEYPAD
+//#define CURSES_KEYPAD
 //*#define ALIGNMENT       4
 #define IMPLEMENTATION  isc_info_db_impl_isc_rt_aix /* 35 */
 #define IEEE
@@ -542,9 +540,9 @@ typedef unsigned int64 UATOM;
 #define SYSCALL_INTERRUPTED(err)        (((err) == EINTR) || ((err) == ERESTART))	/* pjpg 20001102 */
 #else /* AIX PowerPC */
 #define AIX_PPC
-#define KILLER_SIGNALS
+//#define KILLER_SIGNALS
 #define UNIX
-#define CURSES_KEYPAD
+//#define CURSES_KEYPAD
 //#define ALIGNMENT       4
 #define IMPLEMENTATION  isc_info_db_impl_isc_rt_aix /* 35 */
 #define IEEE
@@ -554,7 +552,6 @@ typedef unsigned int64 UATOM;
 #define MOVE_CLEAR(to,length)           memset (to, 0, (int) (length))
 #define SYSCALL_INTERRUPTED(err)        (((err) == EINTR) || ((err) == ERESTART))	/* pjpg 20001102 */
 
-#define VA_START(list,parmN)    va_start (list, parmN)	/* TMC 081700 */
 #define QUADFORMAT "ll"			/* TMC 081700 */
 #define QUADCONST(n) (n##LL)	/* TMC 081700 */
 
@@ -614,7 +611,6 @@ typedef unsigned __int64 UINT64;
 #endif
 
 #define IEEE
-#define VA_START(list,parmN)    va_start (list, parmN)
 #define API_ROUTINE     __stdcall
 #define API_ROUTINE_VARARG      __cdecl
 #define CLIB_ROUTINE    __cdecl
@@ -830,10 +826,6 @@ typedef struct
 #define LINEFORMAT "ld"
 #endif
 
-/* variable argument definitions */
-
-#define VA_START(list,parmN)    va_start (list, parmN)
-
 /* conditional compilation macros */
 
 
diff --git a/src/jrd/err.cpp b/src/jrd/err.cpp
index 9308ff916a..6fa9de1cf2 100644
--- a/src/jrd/err.cpp
+++ b/src/jrd/err.cpp
@@ -314,7 +314,7 @@ bool ERR_post_warning(ISC_STATUS status, ...)
 	int indx = 0, warning_indx = 0;
 	ISC_STATUS* status_vector;
 
-	VA_START(args, status);
+	va_start(args, status);
 	status_vector = ((thread_db*) JRD_get_thread_data())->tdbb_status_vector;
 
 	if (status_vector[0] != isc_arg_gds ||
diff --git a/src/jrd/gds.cpp b/src/jrd/gds.cpp
index 7059afd84f..4fc4116b99 100644
--- a/src/jrd/gds.cpp
+++ b/src/jrd/gds.cpp
@@ -1140,7 +1140,7 @@ void API_ROUTINE gds__log(const TEXT* text, ...)
 	{
 		fprintf(file, "\n%s%s\t%.25s\t", 
 				   ISC_get_host(name, MAXPATHLEN), gdslogid, ctime(&now));
-		VA_START(ptr, text);
+		va_start(ptr, text);
 		vfprintf(file, text, ptr);
 		fprintf(file, "\n\n");
 		fclose(file);
@@ -2733,7 +2733,7 @@ static void blr_error(gds_ctl* control, const TEXT* string, ...)
 	USHORT offset;
 	va_list args;
 
-	VA_START(args, string);
+	va_start(args, string);
 	blr_format(control, string, args);
 	offset = 0;
 	blr_print_line(control, (SSHORT) offset);
@@ -2755,7 +2755,7 @@ static void blr_format(gds_ctl* control, const char* string, ...)
  **************************************/
 	va_list ptr;
 
-	VA_START(ptr, string);
+	va_start(ptr, string);
 	vsprintf(control->ctl_ptr, string, ptr);
 	while (*control->ctl_ptr)
 		control->ctl_ptr++;
diff --git a/src/jrd/iberr.h b/src/jrd/iberr.h
index e79d892299..60f3592f65 100644
--- a/src/jrd/iberr.h
+++ b/src/jrd/iberr.h
@@ -52,7 +52,7 @@
 #define STUFF_STATUS(status_vector,status)              \
 {                                                       \
     va_list args;                                       \
-    VA_START (args, status);                            \
+    va_start (args, status);                            \
     STUFF_STATUS_function(status_vector, status, args); \
 }
 
diff --git a/src/jrd/jrd.cpp b/src/jrd/jrd.cpp
index bd5b8c3079..f30adbaddc 100644
--- a/src/jrd/jrd.cpp
+++ b/src/jrd/jrd.cpp
@@ -3647,7 +3647,7 @@ ISC_STATUS GDS_START_TRANSACTION(ISC_STATUS * user_status,
 	TEB* teb;
 	const TEB* end;
 	va_list ptr;
-	VA_START(ptr, count);
+	va_start(ptr, count);
 
 	for (teb = tebs, end = teb + count; teb < end; teb++) {
 		teb->teb_database = va_arg(ptr, Attachment**);
diff --git a/src/jrd/log.cpp b/src/jrd/log.cpp
index c3f68c245b..fc9f0e2459 100644
--- a/src/jrd/log.cpp
+++ b/src/jrd/log.cpp
@@ -210,7 +210,7 @@ void LOG_call(enum log_t call_type, ...)
 
 	log_char((SCHAR) call_type);
 
-	VA_START(ptr, call_type);
+	va_start(ptr, call_type);
 
 /* using the argument types described in the table, 
    pop the arguments off the call stack and put
diff --git a/src/jrd/met.epp b/src/jrd/met.epp
index 10cf0b4170..fbac1a4199 100644
--- a/src/jrd/met.epp
+++ b/src/jrd/met.epp
@@ -37,7 +37,7 @@
  * 2004.01.16 Vlad Horsun: added support for default parameters 
  */
 /*
-$Id: met.epp,v 1.124 2004-05-23 03:18:09 brodsom Exp $
+$Id: met.epp,v 1.125 2004-05-23 23:26:30 brodsom Exp $
 */
 // This MUST be at the top of the file
 #ifdef DARWIN
@@ -782,7 +782,7 @@ void MET_error(const TEXT* string, ...)
 	TEXT s[128];
 	va_list ptr;
 
-	VA_START(ptr, string);
+	va_start(ptr, string);
 	vsprintf(s, string, ptr);
 
 	ERR_post(isc_no_meta_update, isc_arg_gds, isc_random, isc_arg_string,
diff --git a/src/jrd/par.cpp b/src/jrd/par.cpp
index 842fd4268d..6830b2502c 100644
--- a/src/jrd/par.cpp
+++ b/src/jrd/par.cpp
@@ -605,7 +605,7 @@ static void error(CompilerScratch* csb, ...)
 /* Don't bother to pass tdbb for error handling */
 	thread_db* tdbb = JRD_get_thread_data();
 
-	VA_START(args, csb);
+	va_start(args, csb);
 
 	csb->csb_running--;
 	offset = csb->csb_running - csb->csb_blr;
@@ -2997,7 +2997,7 @@ static void warning(CompilerScratch* csb, ...)
 
 	thread_db* tdbb = JRD_get_thread_data();
 
-	VA_START(args, csb);
+	va_start(args, csb);
 
 	p = tdbb->tdbb_status_vector;
 
diff --git a/src/jrd/sdl.cpp b/src/jrd/sdl.cpp
index eee97607ee..ec093234ef 100644
--- a/src/jrd/sdl.cpp
+++ b/src/jrd/sdl.cpp
@@ -569,7 +569,7 @@ static ISC_STATUS error(ISC_STATUS * status_vector, ...)
 /* Get the addresses of the argument vector and the status vector, and do
    word-wise copy. */
 
-	VA_START(args, status_vector);
+	va_start(args, status_vector);
 	p = status_vector;
 
 /* Copy first argument */
diff --git a/src/jrd/utl.cpp b/src/jrd/utl.cpp
index 0dc8d2f0f5..b86cefcd33 100644
--- a/src/jrd/utl.cpp
+++ b/src/jrd/utl.cpp
@@ -362,7 +362,7 @@ void API_ROUTINE_VARARG isc_expand_dpb(SCHAR** dpb, SSHORT* dpb_size, ...)
 		new_dpb_length = 1;
 	}
 
-	VA_START(args, dpb_size);
+	va_start(args, dpb_size);
 
 	while (type = va_arg(args, int))
 	{
@@ -431,7 +431,7 @@ void API_ROUTINE_VARARG isc_expand_dpb(SCHAR** dpb, SSHORT* dpb_size, ...)
 
 /* copy in the new runtime items */
 
-	VA_START(args, dpb_size);
+	va_start(args, dpb_size);
 
 	while (type = va_arg(args, int))
 	{
@@ -704,7 +704,7 @@ SLONG API_ROUTINE gds__event_block(SCHAR ** event_buffer,
 	va_list ptr;
 	USHORT i;
 
-	VA_START(ptr, count);
+	va_start(ptr, count);
 
 /* calculate length of event parameter block, 
    setting initial length to include version
@@ -741,7 +741,7 @@ SLONG API_ROUTINE gds__event_block(SCHAR ** event_buffer,
 
 	*p++ = EPB_version1;
 
-	VA_START(ptr, count);
+	va_start(ptr, count);
 
 	i = count;
 	while (i--) {
diff --git a/src/jrd/val.cpp b/src/jrd/val.cpp
index 86514e1aa6..fdebd347ce 100644
--- a/src/jrd/val.cpp
+++ b/src/jrd/val.cpp
@@ -764,7 +764,7 @@ static RTN corrupt(thread_db* tdbb, VDR control, USHORT err_code, jrd_rel* relat
 	TEXT s[256];
 	va_list ptr;
 
-	VA_START(ptr, relation);
+	va_start(ptr, relation);
 
 	SET_TDBB(tdbb);
 	Attachment* att = tdbb->tdbb_attachment;
diff --git a/src/jrd/why.cpp b/src/jrd/why.cpp
index cbda614b2d..c6758b592d 100644
--- a/src/jrd/why.cpp
+++ b/src/jrd/why.cpp
@@ -42,7 +42,7 @@
  *
  */
 /*
-$Id: why.cpp,v 1.72 2004-05-21 06:15:42 robocop Exp $
+$Id: why.cpp,v 1.73 2004-05-23 23:26:31 brodsom Exp $
 */
 
 #include "firebird.h"
@@ -4823,7 +4823,7 @@ ISC_STATUS API_ROUTINE_VARARG GDS_START_TRANSACTION(ISC_STATUS * user_status,
 	}
 
 	end = teb + count;
-	VA_START(ptr, count);
+	va_start(ptr, count);
 
 	for (; teb < end; teb++) {
 		teb->teb_database = va_arg(ptr, FB_API_HANDLE*);
diff --git a/src/remote/interface.cpp b/src/remote/interface.cpp
index 3f32157344..f83ecae8bb 100644
--- a/src/remote/interface.cpp
+++ b/src/remote/interface.cpp
@@ -6129,7 +6129,7 @@ static void move_error( ISC_STATUS status, ...)
    have been handed to us, then post the error.
    N.B., one of the supplied errors should be a 'isc_arg_end' */
 
-	VA_START(ap, status);
+	va_start(ap, status);
 
 	TRDB tdrdb = REM_get_thread_data();
 	p_args = tdrdb->trdb_status_vector;
diff --git a/src/utilities/gsec/gsec.cpp b/src/utilities/gsec/gsec.cpp
index 036881bbb1..ea4af21976 100644
--- a/src/utilities/gsec/gsec.cpp
+++ b/src/utilities/gsec/gsec.cpp
@@ -1177,7 +1177,7 @@ static void util_output( const SCHAR* format, ...)
 	else {
 		UCHAR buf[1000];
 		va_list arglist;
-		VA_START(arglist, format);
+		va_start(arglist, format);
 		vsprintf((char *) buf, format, arglist);
 		va_end(arglist);
 		exit_code = tdsec->tsec_output_proc(tdsec->tsec_output_data, buf);
diff --git a/src/utilities/install/install_svc.cpp b/src/utilities/install/install_svc.cpp
index ac73723871..a102e26fa0 100644
--- a/src/utilities/install/install_svc.cpp
+++ b/src/utilities/install/install_svc.cpp
@@ -530,7 +530,7 @@ void API_ROUTINE gds__log(const TEXT* text, ...)
 {
 	va_list ptr;
 
-	VA_START(ptr, text);
+	va_start(ptr, text);
 	vprintf(text, ptr);
 	printf("\n\n");
 }