[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40220] trunk/lib/win64/gettext: Update gettext library for windows 64bit

[Sergey Sharybin]

Revision: 40220
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40220
Author:   nazgul
Date:     2011-09-15 11:34:33 +0000 (Thu, 15 Sep 2011)
Log Message:
-----------
Update gettext library for windows 64bit

Modified Paths:
--------------
    trunk/lib/win64/gettext/include/libintl.h

Added Paths:
-----------
    trunk/lib/win64/gettext/lib/gnu_gettext.dll
    trunk/lib/win64/gettext/lib/gnu_gettext.lib

Removed Paths:
-------------
    trunk/lib/win64/gettext/lib/gettext.lib

Modified: trunk/lib/win64/gettext/include/libintl.h
===================================================================
--- trunk/lib/win64/gettext/include/libintl.h	2011-09-15 11:32:40 UTC (rev 40219)
+++ trunk/lib/win64/gettext/include/libintl.h	2011-09-15 11:34:33 UTC (rev 40220)
@@ -27,15 +27,14 @@
 extern "C" { 
 #endif
 
-#define USE_SAFE_GETTEXT_DLL 1
-#undef USE_GETTEXT_DLL
+#define USE_SAFE_GETTEXT_DLL
 
 /* See if we allready know what we want static or dll linkage or none at all*/
 #if defined DONT_USE_GETTEXT || ( defined USE_SAFE_GETTEXT_DLL && defined USE_GETTEXT_STATIC ) || ( defined USE_GETTEXT_DLL && defined USE_SAFE_GETTEXT_DLL ) || ( defined USE_GETTEXT_DLL && defined USE_GETTEXT_STATIC ) 
 /* TWO IS HARDLY POSSIBLE */
 #undef  USE_GETTEXT_DLL
 #undef  USE_GETTEXT_STATIC
-#undefd USE_SAFE_GETTEXT_DLL
+#undef USE_SAFE_GETTEXT_DLL
 #endif  /* MORE THAN ONE - OR NONE AT ALL */
 
 #if !defined USE_GETTEXT_DLL && !defined USE_SAFE_GETTEXT_DLL && !defined USE_GETTEXT_STATIC && !defined DONT_USE_GETTEXT
@@ -64,6 +63,7 @@
 __declspec(dllimport) char *dcgettext(const char *__domainname,const char *__msgid, int __category);
 __declspec(dllimport) char *textdomain(const char *__domainname);
 __declspec(dllimport) char *bindtextdomain(const char *__domainname,const char *__dirname);
+__declspec(dllimport) char *bind_textdomain_codeset(const char *__domainname,const char *__codeset);
 /* calling _putenv from within the DLL */
 __declspec(dllexport) int gettext_putenv(const char *envstring);
 #endif /* DLL */
@@ -78,8 +78,9 @@
 extern char *dcgettext(const char *szDomain,const char *szMsgId,int iCategory);
 extern char *textdomain(const char *szDomain);
 extern char *bindtextdomain(const char *szDomain,const char *szDirectory);
+extern char *bind_textdomain_codeset(const char *szDomain,const char *szCodeset);
 /* calling _putenv from within the DLL */
-#define gettext_putenv(a) _putenv(a)
+extern int gettext_putenv(const char *envstring);
 #endif /* SAFE DLL */
 
 #if defined USE_GETTEXT_STATIC
@@ -91,24 +92,27 @@
 extern char *dcgettext__(const char *__domainname,const char *__msgid, int __category);
 extern char *textdomain__(const char *__domainname);
 extern char *bindtextdomain__(const char *__domainname,const char *__dirname);
+extern char *bind_textdomain_codeset__(const char *__domainname,const char *__codeset);
 #define gettext(szMsgId) gettext__(szMsgId)
 #define dgettext(szDomain,szMsgId) dgettext__(szDomain,szMsgId)
 #define dcgettext(szDomain,szMsgId,iCategory) dcgettext__(szDomain,szMsgId,iCategory)
 #define textdomain(szDomain) textdomain__(szDomain)
 #define bindtextdomain(szDomain,szDirectory) bindtextdomain__(szDomain,szDirectory)
+#define bind_textdomain_codeset(szDomain,szCodeset) bindtextdomain_codeset__(szDomain,szCodeset)
 // dummy - for static linkage -  calling _putenv from within the DLL
 #define gettext_putenv(a) _putenv(a)
 #endif /* STATIC */
 
 #if defined DONT_USE_GETTEXT
 /* DON'T USE GETTEXT AT ALL
-   MAKROS TO MAKE CODE COMPILE WELL, BUT GETTEXT WILL NOT BE USESD
+   MACROS TO MAKE CODE COMPILE WELL, BUT GETTEXT WILL NOT BE USED
 */
 # define gettext(Msgid) (Msgid)
 # define dgettext(Domainname, Msgid) (Msgid)
 # define dcgettext(Domainname, Msgid, Category) (Msgid)
 # define textdomain(Domainname) ((char *) Domainname)
 # define bindtextdomain(Domainname, Dirname) ((char *) Dirname)
+# define bind_textdomain_codeset(Domainname, Codeset) ((char *) Codeset)
 // dummy - for static linkage -  calling _putenv from within the DLL
 # define gettext_putenv(a) _putenv(a)
 #endif /* DON'T USE AT ALL */
@@ -118,3 +122,4 @@
 #endif
 
 #endif /*!defined(__LIBINTL_H_INCLUDED)*/
+

Deleted: trunk/lib/win64/gettext/lib/gettext.lib
===================================================================
(Binary files differ)

Added: trunk/lib/win64/gettext/lib/gnu_gettext.dll
===================================================================
(Binary files differ)


Property changes on: trunk/lib/win64/gettext/lib/gnu_gettext.dll
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/lib/win64/gettext/lib/gnu_gettext.lib
===================================================================
(Binary files differ)


Property changes on: trunk/lib/win64/gettext/lib/gnu_gettext.lib
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream