Changeset 24592

Timestamp:

11/22/08 05:32:53 (7 weeks ago)

Author:

saturday06

Message:

p

Location:

lang/c/libintl-msvc

Files:

• samples/sample.cpp (modified) (3 diffs)
• step1.sh (modified) (1 diff)
• step2.bat (modified) (2 diffs)

lang/c/libintl-msvc/samples/sample.cpp

@@ -3 +3 @@
 #include <shlwapi.h>
 #include <string>
+#include <vector>
+#include <fstream>
 
 #include "../libintl.h"
@@ -24 +26 @@
     }
 
-    TCHAR my_dir[3000] = {};
-    DWORD result = GetModuleFileName(
-        GetModuleHandle(NULL),
-        my_dir,
-        sizeof(my_dir) / sizeof(*my_dir));
+    std::vector<TCHAR> my_dir(3000);
+    DWORD result = GetModuleFileName(GetModuleHandle(NULL), 
+                                     &my_dir[0], my_dir.size());
 
-    if (result == 0 || result == sizeof(my_dir) / sizeof(*my_dir)) {
+    if (result == 0 || result == my_dir.size()) {
         return 1;
     }
 
-    if (PathRemoveFileSpec(my_dir) == FALSE) {
+    if (PathRemoveFileSpec(&my_dir[0]) == FALSE) {
         return 1;
     }
 
     std::basic_string<TCHAR> locale_dir;
-    locale_dir += my_dir;
+    locale_dir += &my_dir[0];
     locale_dir += _T("\\locale");
 
@@ -64 +64 @@
     MessageBox(NULL, _("Hello, world!"), _T("sample"), MB_OK);
 
+
+    void use_symbol();
+    use_symbol();
     return 0;
 }
+
+
+void use_symbol() {
+    std::ofstream("nul") << 
+        (intptr_t)libintl_gettext +
+        (intptr_t)libintl_gettext + 
+        (intptr_t)libintl_dgettext +
+        (intptr_t)libintl_dcgettext + 
+        (intptr_t)libintl_ngettext + 
+        (intptr_t)libintl_dngettext +
+        (intptr_t)libintl_dcngettext+ 
+        (intptr_t)libintl_bindtextdomain + 
+        (intptr_t)libintl_textdomain +
+        (intptr_t)libintl_bind_textdomain_codeset +
+        0;
+}
+
+

lang/c/libintl-msvc/step1.sh

@@ -47 +47 @@
   loadmsgcat.o localealias.o textdomain.o l10nflist.o explodename.o dcigettext.o \
   dcngettext.o dngettext.o ngettext.o plural.o plural-exp.o localcharset.o lock.o \
-  relocatable.o langprefs.o localename.o version.o intl-compat.o tsearch.o log.o \
+  relocatable.o langprefs.o localename.o version.o tsearch.o log.o \
 "
+#intl-compat.o
 
 if [ "$use_POSIX_XSI_format_strings" = "yes" ]; then

lang/c/libintl-msvc/step2.bat

@@ -3 +3 @@
 REM --------------------
 
+del libintl.lib libintl-win9x.lib
 lib /OUT:libintl.lib       recipes\msvc-obj\*.obj
 lib /OUT:libintl-win9x.lib  recipes\msvc-win9x-obj\*.obj
@@ -12 +13 @@
 REM use win_iconv.c
 cd samples
+del msvc-sample.exe msvc-sample-win9x.exe
+
 cl /Ot /Femsvc-sample-win9x.exe sample.cpp ..\libintl-win9x.lib ..\win_iconv.c user32.lib /EHsc
 cl /Ot /Femsvc-sample.exe sample.cpp ..\libintl.lib ..\win_iconv.c user32.lib /EHsc /DUNICODE  /D_UNICODE
+
 msvc-sample-win9x
 msvc-sample