← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/oldlibdrizzle/vio.h

Merge trunk and resolve all conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/oldlibdrizzle/vio.h
18
18
 * Purpose: include file for Vio that will work with C and C++
19
19
 */
20
20
 
21
 
#ifndef LIBDRIZZLECLIENT_VIO_H
22
 
#define LIBDRIZZLECLIENT_VIO_H
 
21
#ifndef PLUGIN_OLDLIBDRIZZLE_VIO_H
 
22
#define PLUGIN_OLDLIBDRIZZLE_VIO_H
23
23
 
24
24
#include <sys/socket.h>
25
25
#include <errno.h>
134
134
  char                  *read_buffer;   /* buffer for drizzleclient_vio_read_buff */
135
135
};
136
136
 
137
 
#endif /* LIBDRIZZLECLIENT_VIO_H */
 
137
#endif /* PLUGIN_OLDLIBDRIZZLE_VIO_H */