summaryrefslogtreecommitdiff
path: root/tests/test-canonicalize-lgpl.c
diff options
context:
space:
mode:
authorEric Blake <ebb9@byu.net>2009-09-11 12:18:10 -0600
committerEric Blake <ebb9@byu.net>2009-09-17 19:16:24 -0600
commit99ad8ac789556142ef090fcaefae36aabef00ca4 (patch)
tree242e67e4150c55b20d71144283319f7749ae1925 /tests/test-canonicalize-lgpl.c
parent8e7fa996cb189829ed7c9a4f2f489b9150a6571d (diff)
downloadgnulib-99ad8ac789556142ef090fcaefae36aabef00ca4.tar.gz
canonicalize, canonicalize-lgpl: use <stdlib.h>
Match current gnulib conventions of glibc functions being declared in the same header as glibc. This makes it easier to replace broken canonicalize_file_name. canonicalize still requires "canonicalize.h" because canonicalize_filename_mode is not in glibc. With this patch, canonicalize-lgpl always provides realpath and canonicalize_file_name, while canonicalize can provide canonicalize_file_name but not realpath; if both modules are in use, canonicalize_file_name comes from the LGPLv2+ sources, but the testing comes from canonicalize. * modules/canonicalize-lgpl (Files): Drop canonicalize.h. (Include): Mention <stdlib.h>. (configure.ac): Mention functions we provide. * modules/canonicalize (configure.ac): Likewise. * m4/canonicalize-lgpl.m4 (gl_CANONICALIZE_LGPL): Always replace realpath if canonicalize_file_name is missing. * m4/stdlib_h.m4 (gl_STDLIB_H_DEFAULTS): Provide defaults. * modules/stdlib (Makefile.am): Substitute witnesses. * lib/stdlib.in.h (canonicalize_file_name, realpath): Declare. * lib/canonicalize-lgpl.c (includes): Adjust accordingly. * lib/canonicalize.h (canonicalize_file_name): Drop declaration. * NEWS: Document this. * doc/glibc-functions/canonicalize_file_name.texi (canonicalize_file_name): Likewise. * doc/posix-functions/realpath.texi (realpath): Likewise. * tests/test-canonicalize-lgpl.c (includes): Use <stdlib.h>. Signed-off-by: Eric Blake <ebb9@byu.net>
Diffstat (limited to 'tests/test-canonicalize-lgpl.c')
-rw-r--r--tests/test-canonicalize-lgpl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/test-canonicalize-lgpl.c b/tests/test-canonicalize-lgpl.c
index bc58d59049..704c0ecc5a 100644
--- a/tests/test-canonicalize-lgpl.c
+++ b/tests/test-canonicalize-lgpl.c
@@ -18,12 +18,11 @@
#include <config.h>
-#include "canonicalize.h"
+#include <stdlib.h>
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <unistd.h>