Commit 08fbf99d by Manfred Hollstein

fix-header.c (enum special_file): Undefine enumerators if they are already…

fix-header.c (enum special_file): Undefine enumerators if they are already defined by include files.

a
	* fix-header.c (enum special_file): Undefine enumerators if they
	are already defined by include files.
	* fixproto (rel_source_file in unistd.h stdlib.h): Prefix file protection
	macro with '__' to not pollute user namespace.

From-SVN: r19298
parent 4f1817ee
...@@ -267,8 +267,8 @@ do ...@@ -267,8 +267,8 @@ do
rel_source_ident=`echo $rel_source_file | tr ./ __` rel_source_ident=`echo $rel_source_file | tr ./ __`
required_list=`eval echo '${required_'${rel_source_ident}'-}'` required_list=`eval echo '${required_'${rel_source_ident}'-}'`
cat >tmp.h <<EOF cat >tmp.h <<EOF
#ifndef ${rel_source_ident} #ifndef __${rel_source_ident}
#define ${rel_source_ident} #define __${rel_source_ident}
EOF EOF
if test $rel_source_file = stdlib.h if test $rel_source_file = stdlib.h
then then
...@@ -281,7 +281,7 @@ EOF ...@@ -281,7 +281,7 @@ EOF
fi fi
cat >>tmp.h <<EOF cat >>tmp.h <<EOF
#endif /* ${rel_source_ident} */ #endif /* __${rel_source_ident} */
EOF EOF
${FIX_HEADER} $rel_source_file tmp.h $abs_target_dir/$rel_source_file ${DEFINES} $include_path ${FIX_HEADER} $rel_source_file tmp.h $abs_target_dir/$rel_source_file ${DEFINES} $include_path
rm tmp.h rm tmp.h
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment