Prep v233: Add missing updates from upstream in src/basic

[elogind.git] / src / basic / fileio.h

diff --git a/src/basic/fileio.h b/src/basic/fileio.h
index 860d9e15db01c4eadf6884d61b9ea423d4ff06f7..c380ed9fd424f47d2cb0fb37b1f9564447583c74 100644 (file)
--- a/src/basic/fileio.h
+++ b/src/basic/fileio.h
@@ -51,6 +51,8 @@ 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);
 
 #if 0 /// UNNEEDED by elogind
+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);