diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Enum.h | 2 | ||||
| -rw-r--r-- | lib/plpdirent.h | 6 | ||||
| -rw-r--r-- | lib/plpintl.h | 33 | ||||
| -rw-r--r-- | lib/psitime.h | 2 | ||||
| -rw-r--r-- | lib/rfsv.h | 6 | ||||
| -rw-r--r-- | lib/rfsv16.h | 2 | ||||
| -rw-r--r-- | lib/rfsv32.h | 4 | ||||
| -rw-r--r-- | lib/rfsvfactory.h | 2 | ||||
| -rw-r--r-- | lib/rpcs.h | 6 | ||||
| -rw-r--r-- | lib/rpcs16.h | 4 | ||||
| -rw-r--r-- | lib/rpcs32.h | 4 | ||||
| -rw-r--r-- | lib/rpcsfactory.h | 2 |
12 files changed, 53 insertions, 20 deletions
@@ -27,7 +27,7 @@ #include <config.h> #endif -#include <intl.h> +#include <plpintl.h> #include <map> #include <string> diff --git a/lib/plpdirent.h b/lib/plpdirent.h index 9224ebe..c07ce3c 100644 --- a/lib/plpdirent.h +++ b/lib/plpdirent.h @@ -24,8 +24,8 @@ #define _PLPDIRENT_H_ #include <string> -#include "psitime.h" -#include "rfsv.h" +#include <psitime.h> +#include <rfsv.h> /** * A class, representing the UIDs of a file on the Psion. @@ -83,7 +83,7 @@ public: /** * Default constructor */ - PlpDirent(); + PlpDirent(); /** * A copy constructor. diff --git a/lib/plpintl.h b/lib/plpintl.h new file mode 100644 index 0000000..f1caa62 --- /dev/null +++ b/lib/plpintl.h @@ -0,0 +1,33 @@ +#ifndef _INTL_H_ +#define _INTL_H_ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#ifndef HAVE_STPCPY +#include <string.h> + +extern inline char * stpcpy(char *dest, const char *src) { + char c; + do { + c = *dest++ = *src++; + } while (c); + return dest; +} +#endif + +#if defined(ENABLE_NLS) && defined(HAVE_GETTEXT) +# include <libintl.h> +# define N_(x) (x) +# define _(x) gettext(x) +#else +# define N_(x) (x) +# define _(x) (x) +# define textdomain(x) +#endif + +/* Define this, if you have gettext */ +#define HAVE_GETTEXT 1 + +#endif /* _INTL_H_ */ diff --git a/lib/psitime.h b/lib/psitime.h index ef574f9..be9122c 100644 --- a/lib/psitime.h +++ b/lib/psitime.h @@ -42,7 +42,7 @@ #include <sys/types.h> #include <ostream.h> -#include <intl.h> +#include <plpintl.h> /** * Holds a Psion time value. @@ -26,9 +26,9 @@ #include <deque> #include <string> -#include "Enum.h" -#include "plpdirent.h" -#include "bufferstore.h" +#include <Enum.h> +#include <plpdirent.h> +#include <bufferstore.h> typedef deque<class PlpDirent> PlpDir; diff --git a/lib/rfsv16.h b/lib/rfsv16.h index 8682818..fa32e5e 100644 --- a/lib/rfsv16.h +++ b/lib/rfsv16.h @@ -24,7 +24,7 @@ #ifndef _RFSV16_H_ #define _RFSV16_H_ -#include "rfsv.h" +#include <rfsv.h> class rfsvfactory; diff --git a/lib/rfsv32.h b/lib/rfsv32.h index 05da60c..0680354 100644 --- a/lib/rfsv32.h +++ b/lib/rfsv32.h @@ -25,8 +25,8 @@ #ifndef _RFSV32_H_ #define _RFSV32_H_ -#include "rfsv.h" -#include "plpdirent.h" +#include <rfsv.h> +#include <plpdirent.h> class rfsvfactory; diff --git a/lib/rfsvfactory.h b/lib/rfsvfactory.h index 04117fd..add4a20 100644 --- a/lib/rfsvfactory.h +++ b/lib/rfsvfactory.h @@ -25,7 +25,7 @@ #ifndef _RFSVFACTORY_H_ #define _RFSVFACTORY_H_ -#include "rfsv.h" +#include <rfsv.h> class ppsocket; @@ -23,9 +23,9 @@ #ifndef _RPCS_H_ #define _RPCS_H_ -#include "psitime.h" -#include "rfsv.h" -#include "Enum.h" +#include <psitime.h> +#include <rfsv.h> +#include <Enum.h> class ppsocket; class bufferStore; diff --git a/lib/rpcs16.h b/lib/rpcs16.h index 24fcc6e..91b0463 100644 --- a/lib/rpcs16.h +++ b/lib/rpcs16.h @@ -24,7 +24,7 @@ #ifndef _RPCS16_H_ #define _RPCS16_H_ -#include "rpcs.h" +#include <rpcs.h> class ppsocket; class bufferStore; @@ -42,7 +42,7 @@ class rpcs16 : public rpcs { public: Enum<rfsv::errs> queryDrive(const char, bufferArray &); - Enum<rfsv::errs> getCmdLine(const char *, bufferStore &); + Enum<rfsv::errs> getCmdLine(const char *, bufferStore &); private: rpcs16(ppsocket *); diff --git a/lib/rpcs32.h b/lib/rpcs32.h index 5b56a4c..0256b66 100644 --- a/lib/rpcs32.h +++ b/lib/rpcs32.h @@ -24,7 +24,7 @@ #ifndef _RPCS32_H_ #define _RPCS32_H_ -#include "rpcs.h" +#include <rpcs.h> class ppsocket; class rpcsfactory; @@ -41,7 +41,7 @@ class rpcs32 : public rpcs { public: Enum<rfsv::errs> queryDrive(const char, bufferArray &); - Enum<rfsv::errs> getCmdLine(const char *, bufferStore &); + Enum<rfsv::errs> getCmdLine(const char *, bufferStore &); Enum<rfsv::errs> getMachineInfo(machineInfo &); Enum<rfsv::errs> configOpen(void); Enum<rfsv::errs> configRead(void); diff --git a/lib/rpcsfactory.h b/lib/rpcsfactory.h index c08800a..c00388c 100644 --- a/lib/rpcsfactory.h +++ b/lib/rpcsfactory.h @@ -24,7 +24,7 @@ #ifndef _RPCSFACTORY_H_ #define _RPCSFACTORY_H_ -#include "rpcs.h" +#include <rpcs.h> class ppsocket; |