The following commit has been merged in the master branch:
commit 7129d9473993da5e27a6d4eb73a6e900960d337f
Author: Guillem Jover <[email protected]>
Date: Thu Oct 7 10:13:13 2010 +0200
libdpkg: Rename voidfnp to void_func
diff --git a/lib/dpkg/myopt.h b/lib/dpkg/myopt.h
index b3a6783..6c3fb0f 100644
--- a/lib/dpkg/myopt.h
+++ b/lib/dpkg/myopt.h
@@ -25,7 +25,7 @@
DPKG_BEGIN_DECLS
-typedef void (*voidfnp)(void);
+typedef void (*void_func)(void);
struct cmdinfo {
const char *olong;
@@ -36,7 +36,7 @@ struct cmdinfo {
void (*call)(const struct cmdinfo*, const char *value);
int arg;
void *parg;
- voidfnp farg;
+ void_func farg;
};
extern const char printforhelp[];
@@ -58,7 +58,7 @@ void setaction(const struct cmdinfo *cip, const char *value);
void setobsolete(const struct cmdinfo *cip, const char *value);
#define ACTION(longopt, shortopt, code, func) \
- { longopt, shortopt, 0, NULL, NULL, setaction, code, NULL, (voidfnp)func }
+ { longopt, shortopt, 0, NULL, NULL, setaction, code, NULL, (void_func)func }
#define OBSOLETE(longopt, shortopt) \
{ longopt, shortopt, 0, NULL, NULL, setobsolete, 0, NULL, NULL }
diff --git a/src/main.c b/src/main.c
index bd330f0..7113b36 100644
--- a/src/main.c
+++ b/src/main.c
@@ -453,7 +453,7 @@ static const struct cmdinfo cmdinfos[]= {
* have a very similar structure.
*/
#define ACTIONBACKEND(longopt, shortopt, backend) \
- { longopt, shortopt, 0, NULL, NULL, setaction, 0, (void *)backend,
(voidfnp)execbackend }
+ { longopt, shortopt, 0, NULL, NULL, setaction, 0, (void *)backend,
(void_func)execbackend }
ACTION( "install", 'i', act_install,
archivefiles ),
ACTION( "unpack", 0, act_unpack,
archivefiles ),
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
