← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/structs.h

  • Committer: Monty Taylor
  • Date: 2010-12-12 11:52:00 UTC
  • mto: (2023.3.15 innodb-cxx)
  • mto: This revision was merged to the branch mainline in revision 2014.
  • Revision ID: mordred@inaugust.com-20101212115200-uyk1h5crevvt77gh
Revert -Wc++-compat change.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/structs.h
59
59
struct drizzle_st
60
60
{
61
61
  uint16_t error_code;
62
 
  int options;
 
62
  drizzle_options_t options;
63
63
  drizzle_verbose_t verbose;
64
64
  uint32_t con_count;
65
65
  uint32_t pfds_size;
111
111
  uint8_t state_current;
112
112
  short events;
113
113
  short revents;
114
 
  int capabilities;
 
114
  drizzle_capabilities_t capabilities;
115
115
  drizzle_charset_t charset;
116
116
  drizzle_command_t command;
117
 
  int options;
 
117
  drizzle_con_options_t options;
118
118
  drizzle_con_socket_t socket_type;
119
119
  drizzle_con_status_t status;
120
120
  uint32_t max_packet_size;
163
163
  drizzle_st *drizzle;
164
164
  drizzle_query_st *next;
165
165
  drizzle_query_st *prev;
166
 
  int options;
 
166
  drizzle_query_options_t options;
167
167
  drizzle_query_state_t state;
168
168
  drizzle_con_st *con;
169
169
  drizzle_result_st *result;
181
181
  drizzle_con_st *con;
182
182
  drizzle_result_st *next;
183
183
  drizzle_result_st *prev;
184
 
  int options;
 
184
  drizzle_result_options_t options;
185
185
 
186
186
  char info[DRIZZLE_MAX_INFO_SIZE];
187
187
  uint16_t error_code;
221
221
  drizzle_result_st *result;
222
222
  drizzle_column_st *next;
223
223
  drizzle_column_st *prev;
224
 
  int options;
 
224
  drizzle_column_options_t options;
225
225
  char catalog[DRIZZLE_MAX_CATALOG_SIZE];
226
226
  char db[DRIZZLE_MAX_DB_SIZE];
227
227
  char table[DRIZZLE_MAX_TABLE_SIZE];
232
232
  uint32_t size;
233
233
  size_t max_size;
234
234
  drizzle_column_type_t type;
235
 
  int flags;
 
235
  drizzle_column_flags_t flags;
236
236
  uint8_t decimals;
237
237
  uint8_t default_value[DRIZZLE_MAX_DEFAULT_VALUE_SIZE];
238
238
  size_t default_value_size;