X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fbasic%2Ffileio.h;h=6a628086bce173d47a6f38e702e8431e1f1f6011;hp=fe9506c3d3717f4b971e8b6d439c45deda81a5c0;hb=5091db1fa99acdbc3d9acb485c1c70d8bfb636db;hpb=8d0461b82d5084290e9bfb71ab4aa848df196b50

diff --git a/src/basic/fileio.h b/src/basic/fileio.h
index fe9506c3d..6a628086b 100644
--- a/src/basic/fileio.h
+++ b/src/basic/fileio.h
@@ -49,6 +49,8 @@ int parse_env_file(const char *fname, const char *separator, ...) _sentinel_;
 int load_env_file(FILE *f, const char *fname, const char *separator, char ***l);
 int load_env_file_pairs(FILE *f, const char *fname, const char *separator, char ***l);
 
+int merge_env_file(char ***env, FILE *f, const char *fname);
+
 int write_env_file(const char *fname, char **l);
 
 int executable_is_script(const char *path, char **interpreter);