← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_iocache.cc

  • Committer: Stewart Smith
  • Date: 2009-10-08 14:40:26 UTC
  • mto: This revision was merged to the branch mainline in revision 1179.
  • Revision ID: stewart@flamingspork.com-20091008144026-ezk8z1tlnorfpzf8
SunStudio extern C fixes for mf_iocache.cc

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_iocache.cc
62
62
 
63
63
using namespace std;
64
64
 
 
65
extern "C" {
65
66
static int _my_b_read(register IO_CACHE *info, unsigned char *Buffer, size_t Count);
66
67
static int _my_b_read_r(register IO_CACHE *cache, unsigned char *Buffer, size_t Count);
67
68
static int _my_b_seq_read(register IO_CACHE *info, unsigned char *Buffer, size_t Count);
68
69
static int _my_b_write(register IO_CACHE *info, const unsigned char *Buffer, size_t Count);
 
70
}
69
71
 
70
72
#define lock_append_buffer(info) \
71
73
 pthread_mutex_lock(&(info)->append_buffer_lock)
892
894
    1      Error: can't read requested characters
893
895
*/
894
896
 
895
 
static int _my_b_read_r(register IO_CACHE *cache, unsigned char *Buffer, size_t Count)
 
897
extern "C" int _my_b_read_r(register IO_CACHE *cache, unsigned char *Buffer, size_t Count)
896
898
{
897
899
  my_off_t pos_in_file;
898
900
  size_t length, diff_length, left_length;
1060
1062
    1  Failed to read
1061
1063
*/
1062
1064
 
1063
 
static int _my_b_seq_read(register IO_CACHE *info, unsigned char *Buffer, size_t Count)
 
1065
extern "C" int _my_b_seq_read(register IO_CACHE *info, unsigned char *Buffer, size_t Count)
1064
1066
{
1065
1067
  size_t length, diff_length, left_length, save_count, max_length;
1066
1068
  my_off_t pos_in_file;
1410
1412
   -1 On error; my_errno contains error code.
1411
1413
*/
1412
1414
 
1413
 
static int _my_b_write(register IO_CACHE *info, const unsigned char *Buffer, size_t Count)
 
1415
extern "C" int _my_b_write(register IO_CACHE *info, const unsigned char *Buffer, size_t Count)
1414
1416
{
1415
1417
  size_t rest_length,length;
1416
1418