Revert:

	* cp-tree.h (do_poplevel): Remove prototype.
	* semantics.c (do_poplevel): Add prototype.  Make static.

	Revert:
	* cp-tree.h (default_conversion): Remove prototype.
	* typeck.c (default_conversion): Make static.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@110214 138bc75d-0d04-0410-961f-82ee72b054a4