Merge branch 'sdl_android' of github.com:pelya/commandergenius into sdl_android

project/jni/application/fheroes2/AndroidAppSettings.cfg

@@ -180,10 +180,10 @@ MultiABI=all
 AppMinimumRAM=32
 
 # Application version code (integer)
-AppVersionCode=322300
+AppVersionCode=327700
 
 # Application user-visible version name (string)
-AppVersionName="3223.00"
+AppVersionName="3277.00"
 
 # Reset SDL config when updating application to the new version (y) / (n)
 ResetSdlConfigForThisVersion=n

project/jni/application/fheroes2/fheroes2

@@ -1 +1 @@
-../../../../../fheroes2
+/home/gerstrong/workspace/fheroes2/fheroes2-code/fheroes2

project/jni/intl/src/dcigettext.c

@@ -151,9 +151,11 @@ char *getwd ();
 char *getcwd ();
 #  endif
 # endif
+
 # ifndef HAVE_STPCPY
-static char *stpcpy (char *dest, const char *src);
+char *stpcpy (char *dest, const char *src);
 # endif
+
 # ifndef HAVE_MEMPCPY
 static void *mempcpy (void *dest, const void *src, size_t n);
 # endif
@@ -1648,15 +1650,15 @@ get_output_charset (struct binding *domainbinding)
    avoid the non-standard function stpcpy.  In GNU C Library this
    function is available, though.  Also allow the symbol HAVE_STPCPY
    to be defined.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *
+/*#if !_LIBC && !HAVE_STPCPY
+char *
 stpcpy (char *dest, const char *src)
 {
   while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
+    // Do nothing. ;
   return dest - 1;
 }
-#endif
+#endif*/
 
 #if !_LIBC && !HAVE_MEMPCPY
 static void *

project/jni/intl/src/l10nflist.c

@@ -58,7 +58,7 @@
 # endif
 #else
 # ifndef HAVE_STPCPY
-static char *stpcpy (char *dest, const char *src);
+char *stpcpy (char *dest, const char *src);
 # endif
 #endif
 
@@ -390,11 +390,11 @@ _nl_normalize_codeset (const char *codeset, size_t name_len)
    function is available, though.  Also allow the symbol HAVE_STPCPY
    to be defined.  */
 #if !_LIBC && !HAVE_STPCPY
-static char *
+char *
 stpcpy (char *dest, const char *src)
 {
   while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
+    // Do nothing. ;
   return dest - 1;
 }
 #endif