diff options
| author | Erik Troan <ewt@src.gnome.org> | 1998-10-26 21:20:31 +0000 |
|---|---|---|
| committer | Erik Troan <ewt@src.gnome.org> | 1998-10-26 21:20:31 +0000 |
| commit | 64abb889bd8f202bcb03e12e590c0fcd93de2d3d (patch) | |
| tree | b45de39c60c86772b6bc20c1b85ef8907b66c935 | |
| parent | 15a5533a523fcbde6d06b7a1286a4ec09061b903 (diff) | |
| download | gnome-common-64abb889bd8f202bcb03e12e590c0fcd93de2d3d.tar.gz | |
don't typedef poptOption on c++
svn path=/trunk/; revision=455
| -rw-r--r-- | support/popt-gnome.h | 2 | ||||
| -rw-r--r-- | support/popt.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/support/popt-gnome.h b/support/popt-gnome.h index 7f953ac..ba3a815 100644 --- a/support/popt-gnome.h +++ b/support/popt-gnome.h @@ -62,7 +62,9 @@ extern struct poptOption poptHelpOptions[]; 0, "Help options", NULL }, typedef struct poptContext_s * poptContext; +#ifndef __cplusplus typedef struct poptOption * poptOption; +#endif #define POPT_CB_USE_INCLUDE_DATA ((void *) -1) enum poptCallbackReason { POPT_CALLBACK_REASON_PRE, diff --git a/support/popt.h b/support/popt.h index 7f953ac..ba3a815 100644 --- a/support/popt.h +++ b/support/popt.h @@ -62,7 +62,9 @@ extern struct poptOption poptHelpOptions[]; 0, "Help options", NULL }, typedef struct poptContext_s * poptContext; +#ifndef __cplusplus typedef struct poptOption * poptOption; +#endif #define POPT_CB_USE_INCLUDE_DATA ((void *) -1) enum poptCallbackReason { POPT_CALLBACK_REASON_PRE, |