← Back to branch summary

~jaypipes/drizzle/subscriber-plugin

« back to all changes in this revision

Viewing changes to mysys/default.c

  • Committer: Brian Aker
  • Date: 2008-07-05 19:32:59 UTC
  • mfrom: (53.2.28 codestyle)
  • Revision ID: brian@tangent.org-20080705193259-opqzfb0oprfcg8dm
Merge from Monty's tree

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/default.c
87
87
  @return void
88
88
*/
89
89
 
90
 
static void (*init_default_directories)();
 
90
static void (*init_default_directories)(void);
91
91
 
92
92
 
93
93
static char *remove_end_comment(char *ptr);
965
965
    6. "~/"
966
966
*/
967
967
 
968
 
static void init_default_directories_unix()
 
968
static void init_default_directories_unix(void)
969
969
{
970
970
  bzero((char *) default_directories, sizeof(default_directories));
971
971
  ADD_DIRECTORY("/etc/");
972
972
  ADD_DIRECTORY("/etc/mysql/");
973
 
#ifdef DEFAULT_SYSCONFDIR
974
 
  if (DEFAULT_SYSCONFDIR != "")
 
973
#if defined(DEFAULT_SYSCONFDIR)
975
974
    ADD_DIRECTORY(DEFAULT_SYSCONFDIR);
976
975
#endif
977
976
  ADD_COMMON_DIRECTORIES();
978
977
  ADD_DIRECTORY("~/");
979
978
}
980
979
 
981
 
static void (*init_default_directories)()= init_default_directories_unix;
 
980
static void (*init_default_directories)(void)= init_default_directories_unix;