Prepended PDC_ to the IS*_SURROGATE Unicode surrogate test macros.

There have been occasional problems with the fact that Microsoft(R)
has similar macros to ours.  This change should avoid collisions
in the future.

Author: Bill-Gray

curspriv.h

@@ -116,11 +116,9 @@ bool    PDC_touched_range( const WINDOW *win, const int y, int *firstch, int *la
 int     PDC_wscrl(WINDOW *win, const int top, const int bottom, int n);
 
 #ifdef PDC_WIDE
-#ifndef IS_LOW_SURROGATE         /* Microsoft(R) Windows redefines these */
-   #define IS_LOW_SURROGATE( c) ((c) >= 0xdc00 && (c) < 0xe000)
-   #define IS_SURROGATE( x)       ((x) >= 0xd800 && (x) < 0xe000)
-   #define IS_HIGH_SURROGATE( c) ((c) >= 0xd800 && (c) < 0xdc00)
-#endif
+   #define PDC_IS_LOW_SURROGATE( c) ((c) >= 0xdc00 && (c) < 0xe000)
+   #define PDC_IS_SURROGATE( x)       ((x) >= 0xd800 && (x) < 0xe000)
+   #define PDC_IS_HIGH_SURROGATE( c) ((c) >= 0xd800 && (c) < 0xdc00)
 
 int     PDC_mbtowc(wchar_t *, const char *, size_t);
 size_t  PDC_mbstowcs(wchar_t *, const char *, size_t);

pdcurses/addch.c

@@ -536,7 +536,7 @@ int waddch( WINDOW *win, const chtype ch)
     if( x || y)
     {
         const bool is_combining = (text && !text_width);
-        const bool is_low_surrogate = IS_LOW_SURROGATE( text);
+        const bool is_low_surrogate = PDC_IS_LOW_SURROGATE( text);
 
         if( is_combining || is_low_surrogate)
         {
@@ -553,7 +553,7 @@ int waddch( WINDOW *win, const chtype ch)
             if( is_combining)
                 text = COMBINED_CHAR_START
                          + PDC_find_combined_char_idx( prev_char, text);
-            else if( IS_HIGH_SURROGATE( prev_char))
+            else if( PDC_IS_HIGH_SURROGATE( prev_char))
                 text = 0x10000 + ((prev_char - 0xd800) << 10) + (text - 0xdc00);
             else     /* low surrogate after a non-high surrogate;  not */
                 text = prev_char;   /* supposed to happen */
@@ -586,8 +586,6 @@ int waddch( WINDOW *win, const chtype ch)
             if (!SP->raw_out)
                 x = 0;
 
-               /* Had this commented out.  I think it matters in */
-               /* wide,  non-UTF8 mode on some platforms. */
             wclrtoeol(win);
 
             if (++y > win->_bmarg)

pdcurses/getch.c

@@ -662,11 +662,11 @@ static int _raw_wgetch( WINDOW *win)
    int rval = _raw_wgetch_no_surrogate_pairs( win);
 
 #ifdef PDC_WIDE
-   if( IS_HIGH_SURROGATE( rval))
+   if( PDC_IS_HIGH_SURROGATE( rval))
       {
       const int c = _raw_wgetch_no_surrogate_pairs( win);
 
-      if( IS_LOW_SURROGATE( c))
+      if( PDC_IS_LOW_SURROGATE( c))
          rval = ((rval - 0xd800) << 10) + 0x10000 + c - 0xdc00;
       }
 #endif

pdcurses/util.c

@@ -201,9 +201,9 @@ static int _wchar_to_int32_array( int32_t *obuff, const int obuffsize, const wch
 
     for( i = 0; i < obuffsize && *wch; i++)
     {
-        if( IS_SURROGATE( wch[0]))
+        if( PDC_IS_SURROGATE( wch[0]))
         {
-            if( IS_LOW_SURROGATE( wch[1]) && IS_HIGH_SURROGATE( wch[0]))
+            if( PDC_IS_LOW_SURROGATE( wch[1]) && PDC_IS_HIGH_SURROGATE( wch[0]))
                 obuff[i] = (((int32_t)wch[0] - 0xd800) << 10) + 0x10000
                        + (int32_t)wch[1] - 0xdc00;
             else         /* malformed surrogate pair */