- Moved include/intl.h to lib/plpintl.h to fix compile of foreign progs.

- Some NLS-Related fixes

12 files changed, 22 insertions, 27 deletions

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 <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/include/intl.h b/lib/plpintl.h
index f120e47..f1caa62 100644
--- a/include/intl.h
+++ b/lib/plpintl.h
@@ -8,11 +8,11 @@
 #ifndef HAVE_STPCPY
 #include <string.h>
 
-extern inline stpcpy(char *dest, const char *src) {
+extern inline char * stpcpy(char *dest, const char *src) {
 	char c;
 	do {
 		c = *dest++ = *src++;
-	} while (c)
+	} while (c);
 	return dest;
 }
 #endif
@@ -21,18 +21,13 @@ extern inline stpcpy(char *dest, const char *src) {
 #  include <libintl.h>
 #  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/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.
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 <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;
 
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 <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;