diff options
| author | Reuben Thomas <rrt@sc3d.org> | 2006-09-29 00:16:28 +0000 |
|---|---|---|
| committer | Reuben Thomas <rrt@sc3d.org> | 2006-09-29 00:16:28 +0000 |
| commit | 5c392c24398b95df09e474b15691d4159eb38efd (patch) | |
| tree | 44c2a630ac0105dcca7ecc9e2c8b3d41197adb98 /lib/rpcs.cc | |
| parent | 65c2dbb6ae291536574e0066219921b70f593605 (diff) | |
| download | plptools-5c392c24398b95df09e474b15691d4159eb38efd.tar.gz plptools-5c392c24398b95df09e474b15691d4159eb38efd.tar.bz2 plptools-5c392c24398b95df09e474b15691d4159eb38efd.zip | |
Fixes to compile on amd64 (plp_inttypes.h) and with gcc >= 4.1 (the
rest); patches from Debian bugs #384146, #386833 and #388831.
Diffstat (limited to 'lib/rpcs.cc')
| -rw-r--r-- | lib/rpcs.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/rpcs.cc b/lib/rpcs.cc index 44c7a76..b5a70d7 100644 --- a/lib/rpcs.cc +++ b/lib/rpcs.cc @@ -37,7 +37,7 @@ using namespace std; -ENUM_DEFINITION(rpcs::machs, rpcs::PSI_MACH_UNKNOWN) { +ENUM_DEFINITION_BEGIN(rpcs::machs, rpcs::PSI_MACH_UNKNOWN) stringRep.add(rpcs::PSI_MACH_UNKNOWN, N_("Unknown device")); stringRep.add(rpcs::PSI_MACH_PC, N_("PC")); stringRep.add(rpcs::PSI_MACH_MC, N_("MC")); @@ -49,16 +49,17 @@ ENUM_DEFINITION(rpcs::machs, rpcs::PSI_MACH_UNKNOWN) { stringRep.add(rpcs::PSI_MACH_S3C, N_("Series 3c")); stringRep.add(rpcs::PSI_MACH_S5, N_("Series 5")); stringRep.add(rpcs::PSI_MACH_WINC, N_("WinC")); -} +ENUM_DEFINITION_END(rpcs::machs) -ENUM_DEFINITION(rpcs::batterystates, rpcs::PSI_BATT_DEAD) { +ENUM_DEFINITION_BEGIN(rpcs::batterystates, rpcs::PSI_BATT_DEAD) stringRep.add(rpcs::PSI_BATT_DEAD, N_("Empty")); stringRep.add(rpcs::PSI_BATT_VERYLOW, N_("Very Low")); stringRep.add(rpcs::PSI_BATT_LOW, N_("Low")); stringRep.add(rpcs::PSI_BATT_GOOD, N_("Good")); -} +ENUM_DEFINITION_END(rpcs::batterystates) -ENUM_DEFINITION(rpcs::languages, rpcs::PSI_LANG_TEST) { + +ENUM_DEFINITION_BEGIN(rpcs::languages, rpcs::PSI_LANG_TEST) stringRep.add(rpcs::PSI_LANG_TEST, N_("Test")); stringRep.add(rpcs::PSI_LANG_en_GB, N_("English")); stringRep.add(rpcs::PSI_LANG_de_DE, N_("German")); @@ -88,7 +89,7 @@ ENUM_DEFINITION(rpcs::languages, rpcs::PSI_LANG_TEST) { stringRep.add(rpcs::PSI_LANG_sk_SK, N_("Slovak")); stringRep.add(rpcs::PSI_LANG_pl_PL, N_("Polish")); stringRep.add(rpcs::PSI_LANG_sl_SI, N_("Slovenian")); -} +ENUM_DEFINITION_END(rpcs::languages) rpcs::~rpcs() { |