updated to latest gammu version

1 files changed, 21 insertions, 6 deletions

diff --git a/gammu/emb/common/misc/coding/coding.h b/gammu/emb/common/misc/coding/coding.h
index d0c334d..4cf0038 100644
--- a/gammu/emb/common/misc/coding/coding.h
+++ b/gammu/emb/common/misc/coding/coding.h
@@ -1,24 +1,28 @@
 /* (c) 2002-2004 by Marcin Wiacek and others */
 
 #ifndef __coding_h
 #define __coding_h
 
+#if defined(_MSC_VER) && defined(__cplusplus)
+    extern "C" {
+#endif
+
 #include <stdlib.h>
 
 #include "../misc.h"
 
 #ifdef __OpenBSD__
         typedef         int wint_t;
 #endif
 
 /* ---------------------------- Unicode ------------------------------------ */
         bool            mywstrncasecmp          (unsigned const char *a, unsigned const char *b, int num);
-        unsigned char   *mystrstr               (unsigned const char *haystack, unsigned const char *needle);
+        unsigned char   *mywstrstr              (unsigned const char *haystack, unsigned const char *needle);
         bool            mywstrncmp              (unsigned const char *a, unsigned const char *b, int num);
         bool            myiswspace              (unsigned const char *src);
         int             mytowlower              (wchar_t c);
 
         unsigned int    EncodeWithUnicodeAlphabet(const unsigned char *value, wchar_t *dest);
         unsigned int    DecodeWithUnicodeAlphabet(wchar_t value, unsigned char *dest);
 
         unsigned int    UnicodeLength           (const unsigned char *str);
@@ -30,16 +34,19 @@ void		EncodeUnicode			(unsigned char *dest, const unsigned char *src, int len);
         void            CopyUnicodeString       (unsigned char *Dest, unsigned char *Source);
         void            ReverseUnicodeString    (unsigned char *String);
 
         void            ReadUnicodeFile                 (unsigned char *Dest, unsigned char *Source);
 
         void            DecodeUnicodeSpecialNOKIAChars(unsigned char *dest, const unsigned char *src, int len);
         void            EncodeUnicodeSpecialNOKIAChars(unsigned char *dest, const unsigned char *src, int len);
 
+        char            *EncodeUnicodeSpecialChars(unsigned char *buffer);
+        char            *DecodeUnicodeSpecialChars(unsigned char *buffer);
+
 /* ------------------------------- BCD ------------------------------------- */
         unsigned char   EncodeWithBCDAlphabet   (int value);
         int             DecodeWithBCDAlphabet   (unsigned char value);
 
         void            DecodeBCD               (unsigned char *dest, const unsigned char *src, int len);
         void            EncodeBCD               (unsigned char *dest, const unsigned char *src, int len, bool fill);
 
 /* ------------------------------ UTF7 ------------------------------------- */
@@ -81,25 +88,25 @@ int GSM_UnpackEightBitsToSeven	(int offset, int in_length, int out_length,
 /**
  * Enum to handle types of phones numbers like
  * specified in GSM 03.40 section 9.1.2.5
  */
 typedef enum {
         /**
          * Unknown number type
          */
-                NUMBER_UNKNOWN  = 0x81,
+                NUMBER_UNKNOWN_NUMBERING_PLAN_ISDN      = 0x81,
         /**
          * International number (full number with code of country)
          */
-                NUMBER_INTERNATIONAL= 0x91,
+                NUMBER_INTERNATIONAL_NUMBERING_PLAN_ISDN= 0x91,
         /**
          * Alphanumeric number (with chars too)
          */
-                NUMBER_ALPHANUMERIC= 0xD0
+                NUMBER_ALPHANUMERIC_NUMBERING_PLAN_UNKNOWN= 0xD0
 
         /* specification give also other values */
 } GSM_NumberType;
 
         void            GSM_UnpackSemiOctetNumber(unsigned char *retval, unsigned char *Number, bool semioctet);
         int             GSM_PackSemiOctetNumber         (unsigned char *Number, unsigned char *Output, bool semioctet);
 
 /* ---------------------------- Bits --------------------------------------- */
@@ -117,17 +124,25 @@ void GetBufferI   (unsigned char *Source, int *CurrentBit, int *result, int Bits
 int GetBit   (unsigned char *Buffer, int BitNum);
 int SetBit   (unsigned char *Buffer, int BitNum);
 int ClearBit (unsigned char *Buffer, int BitNum);
 
 /* ---------------------------- Other -------------------------------------- */
 
         void StringToDouble(char *text, double *d);
 
-bool mystrncasecmp (unsigned const char *a, unsigned const char *b, int num);
+        bool mystrncasecmp (unsigned const char *a, unsigned const char *b, int num);
+        char *mystrcasestr (unsigned const char *a, unsigned const char *b);
 
-void MyGetLine(unsigned char *Buffer, int *Pos, unsigned char *OutBuffer, int MaxLen);
+        void MyGetLine  (unsigned char *Buffer, int *Pos, unsigned char *OutBuffer, int MaxLen);
+
+char *EncodeSpecialChars(unsigned char *buffer);
+char *DecodeSpecialChars(unsigned char *buffer);
+
+#if defined(_MSC_VER) && defined(__cplusplus)
+    }
+#endif
 
 #endif
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */