From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 7 Feb 2014 22:25:28 +0000 (-0500)
Subject: libe2p: allow libe2p.h to be used in C++ programs
X-Git-Tag: v1.42.9.wc1~57
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=f3fa5689d7ebfb4a5d6fdb7bbfd43306af89a97c;p=tools%2Fe2fsprogs.git

libe2p: allow libe2p.h to be used in C++ programs

In C++, "private" is a reserved keyword, so don't use it in the header
file as a function parameter name.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/lib/e2p/e2p.h b/lib/e2p/e2p.h
index 4a68dd9..5fa41f4 100644
--- a/lib/e2p/e2p.h
+++ b/lib/e2p/e2p.h
@@ -36,7 +36,7 @@ int getflags (int fd, unsigned long * flags);
 int getversion (int fd, unsigned long * version);
 int iterate_on_dir (const char * dir_name,
 		    int (*func) (const char *, struct dirent *, void *),
-		    void * private);
+		    void * private_arg);
 void list_super(struct ext2_super_block * s);
 void list_super2(struct ext2_super_block * s, FILE *f);
 void print_fs_errors (FILE * f, unsigned short errors);