Constexpr in gds_proto + fix mismatch in parameter decl

Author: mrotteveel

src/yvalve/gds_proto.h

@@ -20,25 +20,23 @@
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
  *
- * 2002.10.29 Sean Leyne - Removed obsolete "Netware" port
- *
  */
 
 #ifndef JRD_GDS_PROTO_H
 #define JRD_GDS_PROTO_H
 
 
-const SSHORT IB_PREFIX_TYPE			= 0;
-const SSHORT IB_PREFIX_LOCK_TYPE	= 1;
-const SSHORT IB_PREFIX_MSG_TYPE		= 2;
+inline constexpr SSHORT IB_PREFIX_TYPE		= 0;
+inline constexpr SSHORT IB_PREFIX_LOCK_TYPE	= 1;
+inline constexpr SSHORT IB_PREFIX_MSG_TYPE	= 2;
 
 // flags for gds_alloc_report
-const ULONG ALLOC_dont_report	= 1L << 0;	/* Don't report this block */
-const ULONG ALLOC_silent		= 1L << 1;	/* Don't report new leaks */
-const ULONG ALLOC_verbose		= 1L << 2;	/* Report all leaks, even old */
-const ULONG ALLOC_mark_current	= 1L << 3;	/* Mark all current leaks */
-const ULONG ALLOC_check_each_call	= 1L << 4;	/* Check memory integrity on each alloc/free call */
-const ULONG ALLOC_dont_check	= 1L << 5;	/* Stop checking integrity on each call */
+inline constexpr ULONG ALLOC_dont_report		= 1L << 0;	/* Don't report this block */
+inline constexpr ULONG ALLOC_silent				= 1L << 1;	/* Don't report new leaks */
+inline constexpr ULONG ALLOC_verbose			= 1L << 2;	/* Report all leaks, even old */
+inline constexpr ULONG ALLOC_mark_current		= 1L << 3;	/* Mark all current leaks */
+inline constexpr ULONG ALLOC_check_each_call	= 1L << 4;	/* Check memory integrity on each alloc/free call */
+inline constexpr ULONG ALLOC_dont_check			= 1L << 5;	/* Stop checking integrity on each call */
 
 #ifdef __cplusplus
 namespace Firebird
@@ -83,7 +81,7 @@ SLONG	API_ROUTINE gds__interprete(char*, ISC_STATUS**);
 void	API_ROUTINE gds__interprete_a(SCHAR*, SSHORT*, ISC_STATUS*, SSHORT*);
 
 void	API_ROUTINE gds__log(const TEXT*, ...);
-void	API_ROUTINE gds__trace(const char*);
+void	API_ROUTINE gds__trace(const TEXT*);
 void	API_ROUTINE gds__trace_raw(const char*, unsigned int = 0);
 void	API_ROUTINE gds__log_status(const TEXT*, const ISC_STATUS*);
 int		API_ROUTINE gds__msg_close(void*);