diff options
| author | Karel Klic <kklic@redhat.com> | 2010-08-19 11:11:58 +0200 |
|---|---|---|
| committer | Karel Klic <kklic@redhat.com> | 2010-08-19 11:11:58 +0200 |
| commit | d6f6a7a98b83de0d0aa3792fb187b66d9d15953d (patch) | |
| tree | 3f88861519c32e3180d506507f1de3f8e34dfe45 /inc | |
| parent | 8b22e91dc2ac3e73d628486c91f83da5a0e5ec44 (diff) | |
| parent | 96071530ea85635cf87a6bf650b7f5ddbd219f44 (diff) | |
| download | abrt-d6f6a7a98b83de0d0aa3792fb187b66d9d15953d.tar.gz abrt-d6f6a7a98b83de0d0aa3792fb187b66d9d15953d.tar.xz abrt-d6f6a7a98b83de0d0aa3792fb187b66d9d15953d.zip | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/abrtlib.h | 16 | ||||
| -rw-r--r-- | inc/debug_dump.h | 6 | ||||
| -rw-r--r-- | inc/plugin.h | 10 |
3 files changed, 16 insertions, 16 deletions
diff --git a/inc/abrtlib.h b/inc/abrtlib.h index 57097ece..713694b8 100644 --- a/inc/abrtlib.h +++ b/inc/abrtlib.h @@ -40,24 +40,30 @@ /* C++ bits */ #include <string> -#include "abrt_types.h" -#include "xfuncs.h" - /* Some libc's forget to declare these, do it ourself */ extern char **environ; #if defined(__GLIBC__) && __GLIBC__ < 2 int vdprintf(int d, const char *format, va_list ap); #endif - #define NORETURN __attribute__ ((noreturn)) - #undef ARRAY_SIZE #define ARRAY_SIZE(x) ((unsigned)(sizeof(x) / sizeof((x)[0]))) +#if ENABLE_NLS +# include <libintl.h> +# define _(S) gettext(S) +#else +# define _(S) (S) +#endif + + +#include "abrt_types.h" +#include "xfuncs.h" #include "logging.h" + char* skip_whitespace(const char *s); char* skip_non_whitespace(const char *s); diff --git a/inc/debug_dump.h b/inc/debug_dump.h index f8487a65..869cd7d0 100644 --- a/inc/debug_dump.h +++ b/inc/debug_dump.h @@ -41,8 +41,8 @@ class CDebugDump CDebugDump(); ~CDebugDump(); - void Open(const char *pDir); - void Create(const char *pDir, uid_t uid); + bool Open(const char *pDir); + bool Create(const char *pDir, uid_t uid); void Delete(); void Close(); @@ -53,7 +53,7 @@ class CDebugDump void SaveText(const char* pName, const char *pData); void SaveBinary(const char* pName, const char* pData, unsigned pSize); - void InitGetNextFile(); + bool InitGetNextFile(); /* Pointers may be NULL */ bool GetNextFile(std::string *short_name, std::string *full_name); }; diff --git a/inc/plugin.h b/inc/plugin.h index ebad0866..420a7cd8 100644 --- a/inc/plugin.h +++ b/inc/plugin.h @@ -22,17 +22,11 @@ #ifndef PLUGIN_H_ #define PLUGIN_H_ -#include "abrt_types.h" -#include "crash_types.h" #if HAVE_CONFIG_H # include <config.h> #endif -#if ENABLE_NLS -# include <libintl.h> -# define _(S) gettext(S) -#else -# define _(S) (S) -#endif +#include "abrt_types.h" +#include "crash_types.h" #define PLUGINS_MAGIC_NUMBER 6 |