Mercurial > hg > octave-nkf > gnulib-hg

changeset 14847:5afc11b3902a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* modules/assert-h (assert.h): Substitute the symbol-prefix more consistently.
author Paul Eggert <eggert@cs.ucla.edu>
date Sun, 29 May 2011 14:31:22 -0700
parents a8d8fc44bcc4
children 701eb96461de
files ChangeLog modules/assert-h
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 	assert-h: work around 'verify' incompatibility
 	* lib/verify.h: Use @...@ directives, not ifdef.
 	* modules/assert-h (assert.h): Implement the directives.
+	(assert.h): Substitute the symbol-prefix more consistently.
 
 2011-05-29  Jim Meyering  <meyering@redhat.com>
 
--- a/modules/assert-h
+++ b/modules/assert-h
@@ -26,10 +26,10 @@
 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_ASSERT_H''@|$(NEXT_ASSERT_H)|g' \
 	      < $(srcdir)/assert.in.h && \
-	  sed -e 's|_GL_VERIFY_H|_${gl_include_guard_prefix}_STATIC_ASSERT_H|g' \
-	      -e '/@assert.h omit start@/,/@assert.h omit end@/d' \
+	  sed -e '/@assert.h omit start@/,/@assert.h omit end@/d' \
 	      -e 's|_gl_verify|_gl_static_assert|g' \
 	      -e 's|_GL_VERIFY|_GL_STATIC_ASSERT|g' \
+	      -e 's|_GL\(_STATIC_ASSERT_H\)|_${gl_include_guard_prefix}\1|g' \
 	      < $(srcdir)/verify.h; \
 	} > $@-t && \
 	mv $@-t $@