aboutsummaryrefslogtreecommitdiff
path: root/argp
diff options
context:
space:
mode:
Diffstat (limited to 'argp')
-rw-r--r--argp/argp-fmtstream.h6
-rw-r--r--argp/argp-parse.c2
-rw-r--r--argp/argp.h6
3 files changed, 7 insertions, 7 deletions
diff --git a/argp/argp-fmtstream.h b/argp/argp-fmtstream.h
index d1a262a786..ebc68380c0 100644
--- a/argp/argp-fmtstream.h
+++ b/argp/argp-fmtstream.h
@@ -23,8 +23,8 @@
that. This header file is only used internally while compiling argp, and
shouldn't be installed. */
-#ifndef __ARGP_FMTSTREAM_H__
-#define __ARGP_FMTSTREAM_H__
+#ifndef _ARGP_FMTSTREAM_H
+#define _ARGP_FMTSTREAM_H
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -294,4 +294,4 @@ __argp_fmtstream_point (argp_fmtstream_t __fs)
#endif /* ARGP_FMTSTREAM_USE_LINEWRAP */
-#endif /* __ARGP_FMTSTREAM_H__ */
+#endif /* argp-fmtstream.h */
diff --git a/argp/argp-parse.c b/argp/argp-parse.c
index 018a97807e..553dd88552 100644
--- a/argp/argp-parse.c
+++ b/argp/argp-parse.c
@@ -42,7 +42,7 @@
#endif
#if _LIBC - 0
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#else
#ifdef HAVE_CTHREADS_H
#include <cthreads.h>
diff --git a/argp/argp.h b/argp/argp.h
index 2305590a5d..600264e6b7 100644
--- a/argp/argp.h
+++ b/argp/argp.h
@@ -18,8 +18,8 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef __ARGP_H__
-#define __ARGP_H__
+#ifndef _ARGP_H
+#define _ARGP_H
#include <stdio.h>
#include <ctype.h>
@@ -551,7 +551,7 @@ __option_is_end (__const struct argp_option *__opt)
# undef __option_is_short
# undef __option_is_end
#endif
-
+#endif /* argp.h */
#endif /* __OPTIMIZE__ */
#ifdef __cplusplus