Changeset 24529

Timestamp:

11/21/08 02:19:19 (7 weeks ago)

Author:

saturday06

Message:

君主online

Location:

lang/c/libintl-msvc

Files:

• README.txt (modified) (1 diff)
• libintl.h (modified) (6 diffs)
• recipes/loadmsgcat-windows.h (modified) (2 diffs)

lang/c/libintl-msvc/README.txt

@@ -3 +3 @@
 to make libintl.lib for msvc
 
-1. execute "1.sh".
+1. execute "step1.sh".
 
-sh 1.sh
+sh step1.sh
 
-2. execute "2.bat". using Visual Studio Command Prompt
+2. execute "step2.bat". using Visual Studio Command Prompt
 
-2.bat
+step2.bat
 

lang/c/libintl-msvc/libintl.h

@@ -490 +490 @@
 #define WCHAR_LIBINTL_MAX_PATH 33000
 
-WCHAR_LIBINTL_STATIC_INLINE const wchar_t*
-windows_wbindtextdomain(const char* domainname, const wchar_t* dirname16)
+WCHAR_LIBINTL_STATIC_INLINE
+const wchar_t *windows_wbindtextdomain (const char* domainname, const wchar_t* dirname16)
 {
   char* dirname8 = NULL;
@@ -497 +497 @@
 
 
-  if (wcslen(dirname16) >= WCHAR_LIBINTL_MAX_PATH)
-    {
-      return NULL;
-    }
-
-  num_elements = WideCharToMultiByte(CP_UTF8, 0, dirname16, -1, NULL, 0, 0, 0);
+  if (wcslen (dirname16) >= WCHAR_LIBINTL_MAX_PATH)
+    {
+      return NULL;
+    }
+
+  num_elements = WideCharToMultiByte (CP_UTF8, 0, dirname16, -1, NULL, 0, 0, 0);
   if (num_elements == 0)
     {
@@ -508 +508 @@
     }
 
-  dirname8 = (char*)malloc(num_elements);
+  dirname8 = (char *)malloc (num_elements);
   if (!dirname8)
     {
@@ -514 +514 @@
     }
 
-  if (0 == WideCharToMultiByte(CP_UTF8, 0, dirname16, -1, dirname8, num_elements, 0, 0))
-    {
-      free(dirname8);
-      return NULL;
-    }
-
-  if (libintl_bindtextdomain(domainname, dirname8) == NULL)
-    {
-      free(dirname8);
-      return NULL;
-    }
-
-  free(dirname8);
+  if (0 == WideCharToMultiByte (CP_UTF8, 0, dirname16, -1, dirname8, num_elements, 0, 0))
+    {
+      free (dirname8);
+      return NULL;
+    }
+
+  if (libintl_bindtextdomain (domainname, dirname8) == NULL)
+    {
+      free (dirname8);
+      return NULL;
+    }
+
+  free (dirname8);
 
   return dirname16;
 }
 
-WCHAR_LIBINTL_STATIC_INLINE const char*
-windows_bindtextdomain(const char* domainname, const char* dirname)
+WCHAR_LIBINTL_STATIC_INLINE
+const char *windows_bindtextdomain(const char* domainname, const char* dirname)
 {
   wchar_t* dirname16 = NULL;
@@ -538 +538 @@
   UINT acp = 0;
   
-  acp = GetACP();
+  acp = GetACP ();
   
-  num_elements = MultiByteToWideChar(acp, 0, dirname, -1, NULL, 0);
+  num_elements = MultiByteToWideChar (acp, 0, dirname, -1, NULL, 0);
   if (num_elements == 0)
     {
@@ -551 +551 @@
     }
 
-  dirname16 = (wchar_t*)malloc(num_elements*sizeof(wchar_t));
-
-  if (0 == MultiByteToWideChar(acp, 0, dirname, -1,
-                               dirname16, num_elements))
-    {
-      free(dirname16);
-      return NULL;
-    }
-
-  if (windows_wbindtextdomain(domainname, dirname16) == NULL)
-    {
-      free(dirname16);
-      return NULL;
-    }
-
-  free(dirname16);
+  dirname16 = (wchar_t *)malloc (num_elements*sizeof(wchar_t));
+
+  if (0 == MultiByteToWideChar (acp, 0, dirname, -1,
+                                dirname16, num_elements))
+    {
+      free (dirname16);
+      return NULL;
+    }
+
+  if (windows_wbindtextdomain (domainname, dirname16) == NULL)
+    {
+      free (dirname16);
+      return NULL;
+    }
+
+  free (dirname16);
 
   return dirname;

lang/c/libintl-msvc/recipes/loadmsgcat-windows.h

@@ -16 +16 @@
 
 int
-open_windows_utf8(const char *pathname8, int flags)
+open_windows_utf8 (const char *pathname8, int flags)
 {
-  wchar_t* pathname16 = NULL;
+  wchar_t *pathname16 = NULL;
   unsigned int num_elements = 0;
   int result = 0;
 
-  num_elements = MultiByteToWideChar(CP_UTF8, 0, pathname8, -1, NULL, 0);
+  num_elements = MultiByteToWideChar (CP_UTF8, 0, pathname8, -1, NULL, 0);
   if (num_elements == 0)
     {
@@ -35 +35 @@
     }
 
-  pathname16 = (wchar_t*)malloc(num_elements*sizeof(wchar_t));
-  if (0 == MultiByteToWideChar(CP_UTF8, 0, pathname8, -1, 
-                               pathname16, num_elements))
+  pathname16 = (wchar_t *)malloc (num_elements*sizeof(wchar_t));
+  if (0 == MultiByteToWideChar (CP_UTF8, 0, pathname8, -1, 
+                                pathname16, num_elements))
     {
-      free(pathname16);
+      free (pathname16);
       errno = EACCES;
       return -1;
     }
 
-  result = _wopen(pathname16, flags);
-  free(pathname16);
+  result = _wopen (pathname16, flags);
+  free (pathname16);
   return result;
 }