X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fopt%2Fopt.h;h=f9a047adb527e790339d759b388304a1de27e687;hp=034404e958e657d882de742f32c9fbf3351ee5dd;hb=c520b4adbbfba5a663b94e71216b90eddd0bf877;hpb=7e381e6c241957ff5840b1d8a0ab5f3bde6337c2

diff --git a/ccan/opt/opt.h b/ccan/opt/opt.h
index 034404e9..f9a047ad 100644
--- a/ccan/opt/opt.h
+++ b/ccan/opt/opt.h
@@ -298,7 +298,7 @@ char *opt_usage_and_exit(const char *extra);
 /* Resolves to the four parameters for non-arg callbacks. */
 #define OPT_CB_NOARG(cb, arg)				\
 	OPT_NOARG,					\
-	cast_if_any(char *(*)(void *), (cb), &*(cb),	\
+	cast_if_any(char *(*)(void *), (cb), (cb)+0,	\
 		    char *(*)(typeof(*(arg))*),		\
 		    char *(*)(const typeof(*(arg))*),	\
 		    char *(*)(const void *)),		\
@@ -307,11 +307,11 @@ char *opt_usage_and_exit(const char *extra);
 /* Resolves to the four parameters for arg callbacks. */
 #define OPT_CB_ARG(cb, show, arg)					\
 	OPT_HASARG, NULL,						\
-	cast_if_any(char *(*)(const char *,void *), (cb), &*(cb),	\
+	cast_if_any(char *(*)(const char *,void *), (cb), (cb)+0,	\
 		    char *(*)(const char *, typeof(*(arg))*),		\
 		    char *(*)(const char *, const typeof(*(arg))*),	\
 		    char *(*)(const char *, const void *)),		\
-	cast_if_type(void (*)(char buf[], const void *), (show), &*(show), \
+	cast_if_type(void (*)(char buf[], const void *), (show), (show)+0, \
 		     void (*)(char buf[], const typeof(*(arg))*)),	\
 	(arg)