diff options
| author | Dominik Wenger <domonoky@googlemail.com> | 2009-08-15 14:09:05 +0000 |
|---|---|---|
| committer | Dominik Wenger <domonoky@googlemail.com> | 2009-08-15 14:09:05 +0000 |
| commit | cb55d5c65f8436b3de6bbf11686a961655183a93 (patch) | |
| tree | 6504a5d49d649764523e534019889c05502e7304 | |
| parent | f4e2d83f0479cbedafadb071e7031500db01a28b (diff) | |
| download | rockbox-cb55d5c65f8436b3de6bbf11686a961655183a93.tar.gz rockbox-cb55d5c65f8436b3de6bbf11686a961655183a93.zip | |
rbutil: move extern "C" declaration into mkamsboot.h
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22319 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | rbutil/mkamsboot/mkamsboot.h | 8 | ||||
| -rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallams.cpp | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/rbutil/mkamsboot/mkamsboot.h b/rbutil/mkamsboot/mkamsboot.h index 3e58341884..51f5b2f699 100644 --- a/rbutil/mkamsboot/mkamsboot.h +++ b/rbutil/mkamsboot/mkamsboot.h @@ -28,6 +28,10 @@ #include <stdint.h> #include <sys/types.h> +#ifdef __cplusplus +extern "C" { +#endif + /* Supported models */ enum { MODEL_UNKNOWN = -1, @@ -152,4 +156,8 @@ int total_size(int model, int rb_packedsize, int of_packedsize); */ int firmware_revision(int model); +#ifdef __cplusplus +}; +#endif + #endif diff --git a/rbutil/rbutilqt/base/bootloaderinstallams.cpp b/rbutil/rbutilqt/base/bootloaderinstallams.cpp index 9b357aedb6..7de6ee6837 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallams.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallams.cpp @@ -21,10 +21,7 @@ #include "bootloaderinstallbase.h" #include "bootloaderinstallams.h" -extern "C" -{ - #include "../mkamsboot/mkamsboot.h" -}; +#include "../mkamsboot/mkamsboot.h" BootloaderInstallAms::BootloaderInstallAms(QObject *parent) : BootloaderInstallBase(parent) |