From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 15 Jul 2011 19:14:41 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
X-Git-Tag: v4.2.8~18
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=4a7e5fa76ce41e82c7e028aea763bcf63cd0237b;hp=38d3fafb8baf5f2d0a3acfcb5a72f5994e75d4a4

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
---

diff --git a/include/yaz/options.h b/include/yaz/options.h
index c4d4e13..a822b47 100644
--- a/include/yaz/options.h
+++ b/include/yaz/options.h
@@ -31,7 +31,7 @@
  */
 
 #ifndef YAZ_OPTIONS_H
-#define TAZ_OPTIONS_H
+#define YAZ_OPTIONS_H
 #include <yaz/yconfig.h>
 
 YAZ_BEGIN_CDECL
@@ -56,7 +56,7 @@ YAZ_BEGIN_CDECL
     The second is zero ore more long option values (synonum for single char)
     If colon is appended, it means the option takes an argument.
 */
-YAZ_EXPORT int options (const char *desc, char **argv, int argc, char **arg);
+YAZ_EXPORT int options(const char *desc, char **argv, int argc, char **arg);
 
 #define YAZ_OPTIONS_ERROR (-1)
 #define YAZ_OPTIONS_EOF (-2)
diff --git a/src/options.c b/src/options.c
index 4d92e13..d0811a9 100644
--- a/src/options.c
+++ b/src/options.c
@@ -17,7 +17,7 @@
 static int arg_no = 1;
 static size_t arg_off = 0;
 
-int options (const char *desc, char **argv, int argc, char **arg)
+int options(const char *desc, char **argv, int argc, char **arg)
 {
     const char *opt_buf = 0;
     size_t i = 0;