about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-10-15 20:59:51 +0000
committerUlrich Drepper <drepper@redhat.com>2005-10-15 20:59:51 +0000
commit684e5a2e89d5d2f3ddc7e4d2d14524ba0f222e04 (patch)
treec600cdbdcfe72f90f46cabb3fa7bc4e618859ce3
parentbc3a45cef800af2281deb54e5be0278a2f153efc (diff)
downloadglibc-684e5a2e89d5d2f3ddc7e4d2d14524ba0f222e04.tar.gz
glibc-684e5a2e89d5d2f3ddc7e4d2d14524ba0f222e04.tar.xz
glibc-684e5a2e89d5d2f3ddc7e4d2d14524ba0f222e04.zip
[BZ #1221]
	* posix/regex_internal.h: Remove last traces of
	RE_NO_INTERNAL_PROTOTYPES.
-rw-r--r--ChangeLog4
-rw-r--r--posix/regex_internal.h8
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 8a722f3b3c..51614ac6aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-10-15  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #1221]
+	* posix/regex_internal.h: Remove last traces of
+	RE_NO_INTERNAL_PROTOTYPES.
+
 	[BZ #968]
 	* string/strxfrm_l.c (STRXFRM): Fix exit conditions of two loops.
 
diff --git a/posix/regex_internal.h b/posix/regex_internal.h
index 93b848c4a4..d1447a4d5e 100644
--- a/posix/regex_internal.h
+++ b/posix/regex_internal.h
@@ -377,20 +377,18 @@ typedef struct re_dfa_t re_dfa_t;
 # endif
 #endif
 
-#ifndef RE_NO_INTERNAL_PROTOTYPES
 static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr,
 						int new_buf_len)
      internal_function;
-# ifdef RE_ENABLE_I18N
+#ifdef RE_ENABLE_I18N
 static void build_wcs_buffer (re_string_t *pstr) internal_function;
 static int build_wcs_upper_buffer (re_string_t *pstr) internal_function;
-# endif /* RE_ENABLE_I18N */
+#endif /* RE_ENABLE_I18N */
 static void build_upper_buffer (re_string_t *pstr) internal_function;
 static void re_string_translate_buffer (re_string_t *pstr) internal_function;
 static unsigned int re_string_context_at (const re_string_t *input, int idx,
 					  int eflags)
      internal_function __attribute ((pure));
-#endif
 #define re_string_peek_byte(pstr, offset) \
   ((pstr)->mbs[(pstr)->cur_idx + offset])
 #define re_string_fetch_byte(pstr) \
@@ -702,7 +700,7 @@ bitset_mask (bitset_t dest, const bitset_t src)
     dest[bitset_i] &= src[bitset_i];
 }
 
-#if defined RE_ENABLE_I18N && !defined RE_NO_INTERNAL_PROTOTYPES
+#ifdef RE_ENABLE_I18N
 /* Inline functions for re_string.  */
 static inline int
 internal_function __attribute ((pure))