← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_getopt.h

Merge trunk and resolve all conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_getopt.h
13
13
   along with this program; if not, write to the Free Software
14
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
 
#ifndef _my_getopt_h
17
 
#define _my_getopt_h
 
16
#ifndef MYSYS_MY_GETOPT_H
 
17
#define MYSYS_MY_GETOPT_H
18
18
 
19
 
#include <mysys/my_sys.h>
 
19
#include "mysys/my_sys.h"
20
20
 
21
21
#define GET_NO_ARG     1
22
22
#define GET_BOOL       2
90
90
}
91
91
#endif
92
92
 
93
 
#endif /* _my_getopt_h */
 
93
#endif /* MYSYS_MY_GETOPT_H */
94
94