From 469d0a16138b683858a72e2d71e4abf8a7f9bc0f Mon Sep 17 00:00:00 2001 From: Fritz Elfert Date: Mon, 21 May 2001 21:50:47 +0000 Subject: - Moved include/intl.h to lib/plpintl.h to fix compile of foreign progs. - Some NLS-Related fixes --- include/intl.h | 38 -------------------------------------- lib/Enum.h | 2 +- lib/plpdirent.h | 6 +++--- lib/plpintl.h | 33 +++++++++++++++++++++++++++++++++ lib/psitime.h | 2 +- lib/rfsv.h | 6 +++--- lib/rfsv16.h | 2 +- lib/rfsv32.h | 4 ++-- lib/rfsvfactory.h | 2 +- lib/rpcs.h | 6 +++--- lib/rpcs16.h | 4 ++-- lib/rpcs32.h | 4 ++-- lib/rpcsfactory.h | 2 +- 13 files changed, 53 insertions(+), 58 deletions(-) delete mode 100644 include/intl.h create mode 100644 lib/plpintl.h diff --git a/include/intl.h b/include/intl.h deleted file mode 100644 index f120e47..0000000 --- a/include/intl.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef _INTL_H_ -#define _INTL_H_ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#ifndef HAVE_STPCPY -#include - -extern inline 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 -# define N_(x) (x) -# define _(x) gettext(x) -# ifndef HAVE_BINDTEXTDOMAIN_CODESET -# define bind_textdomain_codeset(p, c) -# endif -#else -# define N_(x) (x) -# define _(x) (x) -# define textdomain(x) -# define bind_textdomain_codeset(p, c) -#endif - -/* Define this, if you have gettext */ -#define HAVE_GETTEXT 1 - -#endif /* _INTL_H_ */ - diff --git a/lib/Enum.h b/lib/Enum.h index a4f7bb7..e29b8c0 100644 --- a/lib/Enum.h +++ b/lib/Enum.h @@ -27,7 +27,7 @@ #include #endif -#include +#include #include #include 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 -#include "psitime.h" -#include "rfsv.h" +#include +#include /** * 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 +#endif + +#ifndef HAVE_STPCPY +#include + +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 +# 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 #include -#include +#include /** * Holds a Psion time value. diff --git a/lib/rfsv.h b/lib/rfsv.h index c497f67..ffa23fd 100644 --- a/lib/rfsv.h +++ b/lib/rfsv.h @@ -26,9 +26,9 @@ #include #include -#include "Enum.h" -#include "plpdirent.h" -#include "bufferstore.h" +#include +#include +#include typedef deque 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 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 +#include 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 class ppsocket; diff --git a/lib/rpcs.h b/lib/rpcs.h index b2fb09d..2b40fa9 100644 --- a/lib/rpcs.h +++ b/lib/rpcs.h @@ -23,9 +23,9 @@ #ifndef _RPCS_H_ #define _RPCS_H_ -#include "psitime.h" -#include "rfsv.h" -#include "Enum.h" +#include +#include +#include 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 class ppsocket; class bufferStore; @@ -42,7 +42,7 @@ class rpcs16 : public rpcs { public: Enum queryDrive(const char, bufferArray &); - Enum getCmdLine(const char *, bufferStore &); + Enum 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 class ppsocket; class rpcsfactory; @@ -41,7 +41,7 @@ class rpcs32 : public rpcs { public: Enum queryDrive(const char, bufferArray &); - Enum getCmdLine(const char *, bufferStore &); + Enum getCmdLine(const char *, bufferStore &); Enum getMachineInfo(machineInfo &); Enum configOpen(void); Enum 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 class ppsocket; -- cgit v1.2.3