meson_options.txt

@@ -388,9 +388,3 @@ option('docs',
   value: false,
   description: 'Enable building C of documentation (Requires doxygen)'
 )
-
-option('embedded-libunibreak',
-  type : 'boolean',
-  value : true,
-  description : 'Use the embedded in-tree libunibreak instead of the system libunibreak.'
-)

src/bin/eet/vieet

@@ -68,7 +68,7 @@ do
     if [ $? -ne 0 ]; then
         echo "Failed compiling eet file."
         echo "Press 'Return' to reopen the editor, or ^C to abort."
-        read _dummy
+        read
     else
         DONE=1
     fi

src/static_libs/libunibreak/meson.build

@@ -1,35 +1,32 @@
-if (get_option('embedded-libunibreak'))
-  libunibreak_src = [
-    'unibreakbase.h',
-    'unibreakdef.h',
-    'linebreak.h',
-    'linebreakdef.h',
-    'wordbreakdef.h',
-    'wordbreak.h',
-    'unibreakbase.c',
-    'unibreakdef.c',
-    'linebreak.c',
-    'linebreakdata.c',
-    'linebreakdef.c',
-    'wordbreak.c',
-    'graphemebreak.c',
-    'graphemebreak.h',
-    'graphemebreakdef.h',
-    'emojidef.h',
-    'emojidef.c',
-  ]
 
-  libunibreak_lib = static_library('libunibreak',
-      libunibreak_src,
-      include_directories : config_dir,
-      install: false,
-  )
+libunibreak_src = [
+  'unibreakbase.h',
+  'unibreakdef.h',
+  'linebreak.h',
+  'linebreakdef.h',
+  'wordbreakdef.h',
+  'wordbreak.h',
+  'unibreakbase.c',
+  'unibreakdef.c',
+  'linebreak.c',
+  'linebreakdata.c',
+  'linebreakdef.c',
+  'wordbreak.c',
+  'graphemebreak.c',
+  'graphemebreak.h',
+  'graphemebreakdef.h',
+  'emojidef.h',
+  'emojidef.c',
+]
 
-  libunibreak = declare_dependency(
-    include_directories: [include_directories('.')],
-    link_with: libunibreak_lib,
-    dependencies: [eina],
-  )
-else
-  libunibreak = dependency('libunibreak', version : '>=4.2')
-endif
+libunibreak_lib = static_library('libunibreak',
+    libunibreak_src,
+    include_directories : config_dir,
+    install: false,
+)
+
+libunibreak = declare_dependency(
+  include_directories: [include_directories('.')],
+  link_with: libunibreak_lib,
+  dependencies: [eina],
+)

src/tests/eina/eina_test_file.c

@@ -551,9 +551,8 @@ static const struct {
   { "C:\\home\\mydir\\..\\myfile", "C:/home/myfile" },
   { "C:/home/mydir/../myfile", "C:/home/myfile" },
   { "\\home\\mydir\\..\\myfile", "/home/myfile" },
-#else
-  { "/home/mydir/../myfile", "/home/myfile" }
 #endif
+  { "/home/mydir/../myfile", "/home/myfile" }
 };
 
 EFL_START_TEST(eina_test_file_path)

src/tests/eina/eina_test_value.c

@@ -93,11 +93,6 @@ EFL_START_TEST(eina_value_test_simple)
    fail_unless(l == 0xb33f);
    eina_value_flush(value);
 
-   /*
-    * On Windows, long is always a 4 bytes type, so this check
-    * will never work on Windows.
-    */
-#ifndef _WIN32
    fail_unless(eina_value_setup(value, EINA_VALUE_TYPE_INT64));
    fail_unless(eina_value_set(value, 0x0011223344556677));
    fail_unless(eina_value_get(value, &i64));
@@ -108,7 +103,6 @@ EFL_START_TEST(eina_value_test_simple)
    fail_unless(l == (long)0x0011223344556677);
    fail_unless(i64 == 0x0011223344556677);
    eina_value_flush(value);
-#endif
 
    /* unsigned: */
 
@@ -156,11 +150,6 @@ EFL_START_TEST(eina_value_test_simple)
    fail_unless(ul == 3000000001UL);
    eina_value_flush(value);
 
-   /*
-    * On Windows, long is always a 4 bytes type, so this check
-    * will never work on Windows.
-    */
-#ifndef _WIN32
    fail_unless(eina_value_setup(value, EINA_VALUE_TYPE_UINT64));
    fail_unless(eina_value_set(value, 0x1122334455667788));
    fail_unless(eina_value_get(value, &u64));
@@ -171,7 +160,6 @@ EFL_START_TEST(eina_value_test_simple)
    fail_unless(ul == (unsigned long)0x1122334455667788);
    fail_unless(u64 == 0x1122334455667788);
    eina_value_flush(value);
-#endif
 
    /* floating point */
    fail_unless(eina_value_setup(value, EINA_VALUE_TYPE_FLOAT));