>From 04e29d51b1067a6c532eba160bb675515006ab47 Mon Sep 17 00:00:00 2001
From: Alexpux <[email protected]>
Date: Thu, 18 Dec 2014 10:23:11 +0300
Subject: [PATCH] Cobol interface: fix warnings and cast error.
---
src/gpre/languages/fbrmclib.cpp | 19 +++++++++------------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/gpre/languages/fbrmclib.cpp
b/src/gpre/languages/fbrmclib.cpp
index 6441dc3..26e4b5b 100644
--- a/src/gpre/languages/fbrmclib.cpp
+++ b/src/gpre/languages/fbrmclib.cpp
@@ -72,9 +72,9 @@ struct argument_entry
struct entry_table
{
- char *EntryPointCobolName;
- int (*EntryPointAddress)(char *, int, argument_entry *, int);
- char *EntryPointName;
+ const char *EntryPointCobolName;
+ int (*EntryPointAddress)(char *, int, argument_entry *, int);
+ const char *EntryPointName;
};
struct date_fmt
@@ -1392,8 +1392,7 @@ EXPORT RM_ENTRY(rmc_status_address)
CobolToStatus(stat, &arg_vector[0]);
ISC_STATUS *p = stat;
- *(ISC_ULONG *)arg_vector[-1].a_address = (ISC_ULONG)p;
-
+ *(uintptr_t *)arg_vector[-1].a_address = (uintptr_t)p;
return (0);
}
@@ -1666,24 +1663,24 @@ EXPORT RM_ENTRY(rmc_ctos)
return (0);
}
-static char* banner = "Firebird Embedded SQL Interface";
+static const char* banner = "Firebird Embedded SQL Interface";
#ifdef __cplusplus
extern "C" {
#endif
-char* RM_AddOnBanner();
-char* RM_AddOnLoadMessage();
+const char* RM_AddOnBanner();
+const char* RM_AddOnLoadMessage();
#ifdef __cplusplus
}
#endif
// Return additional banner message for this module
-char* RM_AddOnBanner()
+const char* RM_AddOnBanner()
{
return (banner);
}
-char* RM_AddOnLoadMessage()
+const char* RM_AddOnLoadMessage()
{
return (banner);
}
--
2.2.0
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
Firebird-Devel mailing list, web interface at
https://lists.sourceforge.net/lists/listinfo/firebird-devel
