[Firebird-checkins] SF.net SVN: firebird:[57069] firebird/branches/B2_5_Release/src/jrd

[<ale...@us...>]

Revision: 57069
          http://firebird.svn.sourceforge.net/firebird/?rev=57069&view=rev
Author:   alexpeshkoff
Date:     2012-08-29 11:35:16 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
Fixed CORE-3911: API entrypoints Bopen and BLOB_open are not visible on Darwin

Modified Paths:
--------------
    firebird/branches/B2_5_Release/src/jrd/ibase.h
    firebird/branches/B2_5_Release/src/jrd/utl.cpp
    firebird/branches/B2_5_Release/src/jrd/utl_proto.h

Modified: firebird/branches/B2_5_Release/src/jrd/ibase.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/ibase.h	2012-08-29 11:30:42 UTC (rev 57068)
+++ firebird/branches/B2_5_Release/src/jrd/ibase.h	2012-08-29 11:35:16 UTC (rev 57069)
@@ -154,7 +154,7 @@
 	short			bstr_length;	/* Length of buffer */
 	short			bstr_cnt;		/* Characters in buffer */
 	char			bstr_mode;		/* (mode) ? OUTPUT : INPUT */
-} BSTREAM;
+} BSTREAM, *BLOBSTREAM;
 
 /* Three ugly macros, one even using octal radix... sigh... */
 #define getb(p)	(--(p)->bstr_cnt >= 0 ? *(p)->bstr_ptr++ & 0377: BLOB_get (p))

Modified: firebird/branches/B2_5_Release/src/jrd/utl.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/utl.cpp	2012-08-29 11:30:42 UTC (rev 57068)
+++ firebird/branches/B2_5_Release/src/jrd/utl.cpp	2012-08-29 11:35:16 UTC (rev 57069)
@@ -1261,7 +1261,7 @@
 }
 
 
-int API_ROUTINE BLOB_close(BSTREAM* bstream)
+int API_ROUTINE BLOB_close(BLOBSTREAM bstream)
 {
 /**************************************
  *
@@ -1480,7 +1480,7 @@
 }
 
 
-int API_ROUTINE BLOB_get(BSTREAM* bstream)
+int API_ROUTINE BLOB_get(BLOBSTREAM bstream)
 {
 /**************************************
  *
@@ -1608,7 +1608,7 @@
 }
 
 
-BSTREAM* API_ROUTINE Bopen(ISC_QUAD* blob_id,
+BLOBSTREAM API_ROUTINE Bopen(ISC_QUAD* blob_id,
 						   FB_API_HANDLE database,
 						   FB_API_HANDLE transaction,
 						   const SCHAR* mode)
@@ -1652,7 +1652,7 @@
 		return NULL;
 	}
 
-	BSTREAM* bstream = BLOB_open(blob, NULL, 0);
+	BLOBSTREAM bstream = BLOB_open(blob, NULL, 0);
 
 	if (*mode == 'w' || *mode == 'W')
 	{
@@ -1671,7 +1671,7 @@
 
 
 // CVC: This routine doesn't open a blob really!
-BSTREAM* API_ROUTINE BLOB_open(FB_API_HANDLE blob, SCHAR* buffer, int length)
+BLOBSTREAM API_ROUTINE BLOB_open(FB_API_HANDLE blob, SCHAR* buffer, int length)
 {
 /**************************************
  *
@@ -1686,7 +1686,7 @@
 	if (!blob)
 		return NULL;
 
-	BSTREAM* bstream = (BSTREAM*) gds__alloc((SLONG) sizeof(BSTREAM));
+	BLOBSTREAM bstream = (BLOBSTREAM) gds__alloc((SLONG) sizeof(BSTREAM));
 	// FREE: This structure is freed by BLOB_close
 	if (!bstream)				// NOMEM:
 		return NULL;
@@ -1726,7 +1726,7 @@
 }
 
 
-int API_ROUTINE BLOB_put(SCHAR x, BSTREAM* bstream)
+int API_ROUTINE BLOB_put(SCHAR x, BLOBSTREAM bstream)
 {
 /**************************************
  *

Modified: firebird/branches/B2_5_Release/src/jrd/utl_proto.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/utl_proto.h	2012-08-29 11:30:42 UTC (rev 57068)
+++ firebird/branches/B2_5_Release/src/jrd/utl_proto.h	2012-08-29 11:35:16 UTC (rev 57069)
@@ -26,6 +26,10 @@
 
 #include "../include/fb_types.h"
 
+#ifndef JRD_IBASE_H
+typedef struct bstream* BLOBSTREAM;
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -51,21 +55,21 @@
 												  USHORT, USHORT, TEXT *);
 uintptr_t	API_ROUTINE isc_baddress(SCHAR*);
 void	API_ROUTINE isc_baddress_s(const SCHAR*, uintptr_t*);
-int		API_ROUTINE BLOB_close(struct bstream *);
+int		API_ROUTINE BLOB_close(BLOBSTREAM);
 int		API_ROUTINE blob__display(SLONG*, FB_API_HANDLE*, FB_API_HANDLE*, const TEXT*, const SSHORT*);
 int		API_ROUTINE BLOB_display(ISC_QUAD*, FB_API_HANDLE, FB_API_HANDLE, const TEXT*);
 int		API_ROUTINE blob__dump(SLONG*, FB_API_HANDLE*, FB_API_HANDLE*, const TEXT*, const SSHORT*);
 int		API_ROUTINE BLOB_dump(ISC_QUAD*, FB_API_HANDLE, FB_API_HANDLE, const SCHAR*);
 int		API_ROUTINE blob__edit(SLONG*, FB_API_HANDLE*, FB_API_HANDLE*, const TEXT*, const SSHORT*);
 int		API_ROUTINE BLOB_edit(ISC_QUAD*, FB_API_HANDLE, FB_API_HANDLE, const SCHAR*);
-int		API_ROUTINE BLOB_get(struct bstream*);
+int		API_ROUTINE BLOB_get(BLOBSTREAM);
 int		API_ROUTINE blob__load(SLONG*, FB_API_HANDLE*, FB_API_HANDLE*, const TEXT*, const SSHORT*);
 int		API_ROUTINE BLOB_load(ISC_QUAD*, FB_API_HANDLE, FB_API_HANDLE, const TEXT*);
 int		API_ROUTINE BLOB_text_dump(ISC_QUAD*, FB_API_HANDLE, FB_API_HANDLE, const SCHAR*);
 int		API_ROUTINE BLOB_text_load(ISC_QUAD*, FB_API_HANDLE, FB_API_HANDLE, const TEXT*);
-struct	bstream* API_ROUTINE Bopen(ISC_QUAD*, FB_API_HANDLE, FB_API_HANDLE, const SCHAR*);
-struct  bstream* API_ROUTINE BLOB_open(FB_API_HANDLE, SCHAR*, int);
-int		API_ROUTINE BLOB_put(SCHAR, struct bstream*);
+BLOBSTREAM	API_ROUTINE Bopen(ISC_QUAD*, FB_API_HANDLE, FB_API_HANDLE, const SCHAR*);
+BLOBSTREAM	API_ROUTINE BLOB_open(FB_API_HANDLE, SCHAR*, int);
+int		API_ROUTINE BLOB_put(SCHAR, BLOBSTREAM);
 
 #ifdef __cplusplus
 } /* extern "C" */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.