← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzle.cc

Merged up with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzle.cc
104
104
/**
105
105
 Make the old readline interface look like the new one.
106
106
*/
107
 
#ifndef USE_NEW_READLINE_INTERFACE
108
 
typedef CPPFunction rl_completion_func_t;
109
 
typedef Function rl_compentry_func_t;
 
107
#ifndef HAVE_RL_COMPLETION
 
108
typedef char **rl_completion_func_t(const char *, int, int);
110
109
#define rl_completion_matches(str, func) \
111
110
  completion_matches((char *)str, (CPFunction *)func)
112
111
#endif
113
112
 
 
113
#ifdef HAVE_RL_COMPENTRY
 
114
# ifdef HAVE_WORKING_RL_COMPENTRY
 
115
typedef rl_compentry_func_t drizzle_compentry_func_t;
 
116
# else
 
117
/* Snow Leopard ships an rl_compentry which cannot be assigned to
 
118
 * rl_completion_entry_function. We must undo the complete and total
 
119
 * ass-bagery.
 
120
 */
 
121
typedef Function drizzle_compentry_func_t;
 
122
# endif
 
123
#else
 
124
typedef Function drizzle_compentry_func_t;
 
125
#endif
 
126
 
114
127
#if defined(HAVE_LOCALE_H)
115
128
#include <locale.h>
116
129
#endif
2346
2359
 
2347
2360
  /* Tell the completer that we want a crack first. */
2348
2361
  rl_attempted_completion_function= (rl_completion_func_t*)&mysql_completion;
2349
 
  rl_completion_entry_function= (rl_compentry_func_t*)&no_completion;
 
2362
  rl_completion_entry_function= (drizzle_compentry_func_t*)&no_completion;
2350
2363
}
2351
2364
 
2352
2365