← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle-1.0/structs.h

Fix merge issues with 1.0 CC fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle-1.0/structs.h
39
39
 * @brief Struct Definitions
40
40
 */
41
41
 
42
 
#ifndef __DRIZZLE_STRUCTS_H
43
 
#define __DRIZZLE_STRUCTS_H
 
42
#pragma once
44
43
 
45
44
#include <sys/types.h>
46
45
 
58
57
struct drizzle_st
59
58
{
60
59
  uint16_t error_code;
61
 
  drizzle_options_t options;
 
60
  int options;
62
61
  drizzle_verbose_t verbose;
63
62
  uint32_t con_count;
64
63
  uint32_t pfds_size;
110
109
  uint8_t state_current;
111
110
  short events;
112
111
  short revents;
113
 
  drizzle_capabilities_t capabilities;
 
112
  int capabilities;
114
113
  drizzle_charset_t charset;
115
114
  drizzle_command_t command;
116
 
  drizzle_con_options_t options;
 
115
  int options;
117
116
  drizzle_con_socket_t socket_type;
118
117
  drizzle_con_status_t status;
119
118
  uint32_t max_packet_size;
162
161
  drizzle_st *drizzle;
163
162
  drizzle_query_st *next;
164
163
  drizzle_query_st *prev;
165
 
  drizzle_query_options_t options;
 
164
  int options;
166
165
  drizzle_query_state_t state;
167
166
  drizzle_con_st *con;
168
167
  drizzle_result_st *result;
180
179
  drizzle_con_st *con;
181
180
  drizzle_result_st *next;
182
181
  drizzle_result_st *prev;
183
 
  drizzle_result_options_t options;
 
182
  int options;
184
183
 
185
184
  char info[DRIZZLE_MAX_INFO_SIZE];
186
185
  uint16_t error_code;
220
219
  drizzle_result_st *result;
221
220
  drizzle_column_st *next;
222
221
  drizzle_column_st *prev;
223
 
  drizzle_column_options_t options;
 
222
  int options;
224
223
  char catalog[DRIZZLE_MAX_CATALOG_SIZE];
225
224
  char db[DRIZZLE_MAX_DB_SIZE];
226
225
  char table[DRIZZLE_MAX_TABLE_SIZE];
231
230
  uint32_t size;
232
231
  size_t max_size;
233
232
  drizzle_column_type_t type;
234
 
  drizzle_column_flags_t flags;
 
233
  int flags;
235
234
  uint8_t decimals;
236
235
  uint8_t default_value[DRIZZLE_MAX_DEFAULT_VALUE_SIZE];
237
236
  size_t default_value_size;
240
239
#ifdef __cplusplus
241
240
}
242
241
#endif
243
 
 
244
 
#endif /* __DRIZZLE_STRUCTS_H */