← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/internal/m_string.h

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/internal/m_string.h
19
19
/*  This is needed for the definitions of strchr... on solaris */
20
20
 
21
21
 
22
 
#ifndef MYSTRINGS_M_STRING_H
23
 
#define MYSTRINGS_M_STRING_H
 
22
#ifndef DRIZZLED_INTERNAL_M_STRING_H
 
23
#define DRIZZLED_INTERNAL_M_STRING_H
24
24
 
25
25
#ifndef __USE_GNU
26
26
#define __USE_GNU                               /* We want to use my_stpcpy */
152
152
  return end+1;
153
153
}
154
154
 
155
 
#endif /* MYSTRINGS_M_STRING_H */
 
155
#endif /* DRIZZLED_INTERNAL_M_STRING_H */