~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle-2.0/libdrizzle/constants.h

  • Committer: Monty Taylor
  • Date: 2011-04-03 18:43:29 UTC
  • mfrom: (2265.1.9 merge-vs-work)
  • Revision ID: mordred@inaugust.com-20110403184329-1m5412a60pa7p95o
Merge Monty - Update libdrizzle for windows builds.

Show diffs side-by-side

added added

removed removed

Lines of Context:
42
42
#ifndef __DRIZZLE_CONSTANTS_H
43
43
#define __DRIZZLE_CONSTANTS_H
44
44
 
 
45
#include <stdint.h>
 
46
 
45
47
#ifdef __cplusplus
46
48
 
47
49
#include <vector>
48
50
 
49
51
extern "C" {
 
52
 
50
53
#endif
51
54
 
52
55
/**
450
453
 */
451
454
 
452
455
/* Types. */
 
456
#ifndef __cplusplus
453
457
typedef struct drizzle_st drizzle_st;
454
458
typedef struct drizzle_con_tcp_st drizzle_con_tcp_st;
455
459
typedef struct drizzle_con_uds_st drizzle_con_uds_st;
457
461
typedef struct drizzle_query_st drizzle_query_st;
458
462
typedef struct drizzle_result_st drizzle_result_st;
459
463
typedef struct drizzle_column_st drizzle_column_st;
 
464
#else
 
465
class drizzle_st;
 
466
class drizzle_con_tcp_st;
 
467
class drizzle_con_uds_st;
 
468
class drizzle_con_st;
 
469
class drizzle_query_st;
 
470
class drizzle_result_st;
 
471
class drizzle_column_st;
 
472
#endif
460
473
typedef char drizzle_field_t_type;
461
474
typedef drizzle_field_t_type *drizzle_field_t;
462
475
typedef drizzle_field_t drizzle_row_t_type;