Piotr Caban : msvcrt: Move _pctype definition to locale.c.

Alexandre Julliard julliard at winehq.org
Wed Oct 12 14:31:18 CDT 2011


Module: wine
Branch: master
Commit: 0f53100ade56f365f3355c71bf8910a972114ff4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0f53100ade56f365f3355c71bf8910a972114ff4

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Wed Oct 12 11:56:04 2011 +0200

msvcrt: Move _pctype definition to locale.c.

---

 dlls/msvcrt/ctype.c  |    7 -------
 dlls/msvcrt/locale.c |    1 +
 dlls/msvcrt/msvcrt.h |    1 -
 3 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c
index 6bf4948..ca8b5fd 100644
--- a/dlls/msvcrt/ctype.c
+++ b/dlls/msvcrt/ctype.c
@@ -51,13 +51,6 @@ WORD MSVCRT__ctype [257] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-/* pctype is used by macros in the Win32 headers. It must point
- * To a table of flags exactly like ctype. To allow locale
- * changes to affect ctypes (i.e. isleadbyte), we use a second table
- * and update its flags whenever the current locale changes.
- */
-unsigned short *MSVCRT__pctype = NULL;
-
 /*********************************************************************
  *		__p__pctype (MSVCRT.@)
  */
diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c
index d5003de..7e9cebe 100644
--- a/dlls/msvcrt/locale.c
+++ b/dlls/msvcrt/locale.c
@@ -41,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 #define MAX_ELEM_LEN 64 /* Max length of country/language/CP string */
 #define MAX_LOCALE_LENGTH 256
 MSVCRT__locale_t MSVCRT_locale = NULL;
+unsigned short *MSVCRT__pctype = NULL;
 int MSVCRT___lc_codepage = 0;
 int MSVCRT___lc_collate_cp = 0;
 LCID MSVCRT___lc_handle[MSVCRT_LC_MAX - MSVCRT_LC_MIN + 1] = { 0 };
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index c743a9c..29a3520 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -202,7 +202,6 @@ extern MSVCRT__locale_t MSVCRT_locale;
 extern int MSVCRT___lc_codepage;
 extern int MSVCRT___lc_collate_cp;
 extern WORD MSVCRT__ctype [257];
-extern unsigned short *MSVCRT__pctype;
 
 void   msvcrt_set_errno(int);
 




More information about the wine-cvs mailing list