Merge from gnulib.

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
index e054c520ebe..c9552480e5d 100644
--- a/lib/stdlib.in.h
+++ b/lib/stdlib.in.h
@@ -773,7 +773,7 @@ _GL_WARN_ON_USE (rpmatch, "rpmatch is unportable - "
 _GL_FUNCDECL_SYS (secure_getenv, char *,
                   (char const *name) _GL_ARG_NONNULL ((1)));
 # endif
-_GL_CXXALIAS_SYS (secure_getenv, int, (char const *name));
+_GL_CXXALIAS_SYS (secure_getenv, char *, (char const *name));
 _GL_CXXALIASWARN (secure_getenv);
 #elif defined GNULIB_POSIXCHECK
 # undef secure_getenv
diff --git a/lib/unsetenv.c b/lib/unsetenv.c
index eea21129031..c58c82f4f44 100644
--- a/lib/unsetenv.c
+++ b/lib/unsetenv.c
@@ -14,12 +14,12 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
-
 /* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
    optimizes away the name == NULL test below.  */
 #define _GL_ARG_NONNULL(params)
 
+#include <config.h>
+
 /* Specification.  */
 #include <stdlib.h>