Ticket #14: glib-2.18.4.diff

File glib-2.18.4.diff, 3.3 KB (added by dmik, 12 years ago)

  • gio/gunixmounts.c 

    diff -ur glib-2.18.4-o/gio/gunixmounts.c glib-2.18.4/gio/gunixmounts.c
    old new  
    595595 
    596596  return g_list_reverse (return_list);
    597597}
     598#elif defined(G_OS_BEOS) || defined(G_OS_HAIKU) || defined(__EMX__)
     599static char *
     600get_mtab_monitor_file (void)
     601{
     602  return NULL;
     603}
     604
     605        static GList *
     606        _g_get_unix_mounts (void)
     607        {
     608          GList *return_list = NULL;
     609          return return_list;
     610        }
    598611#else
    599612#error No _g_get_unix_mounts() implementation for system
    600613#endif
    … …  
    975988 
    976989  return g_list_reverse (return_list);
    977990}
     991#elif defined(G_OS_BEOS) || defined(G_OS_HAIKU) || defined(__EMX__)
     992         
     993        static GList *
     994        _g_get_unix_mount_points (void) 
     995        {
     996                GList *return_list = NULL;
     997                return return_list;
     998        }
    978999#else
    9791000#error No g_get_mount_table() implementation for system
    9801001#endif

  • glib/gunicollate.c 

    diff -ur glib-2.18.4-o/glib/gunicollate.c glib-2.18.4/glib/gunicollate.c
    old new  
    374374  g_return_val_if_fail (str != NULL, NULL);
    375375  result = carbon_collate_key (str, len);
    376376
    377 #elif defined(__STDC_ISO_10646__)
     377#elif defined(__STDC_ISO_10646__) && !defined(__EMX__)
    378378
    379379  gsize xfrm_len;
    380380  gunichar *str_norm;

  • tests/timeloop-basic.c 

    diff -ur glib-2.18.4-o/tests/timeloop-basic.c glib-2.18.4/tests/timeloop-basic.c
    old new  
    181181  for (i = 0; i < n_children; i++)
    182182    create_child (i);
    183183
     184#ifndef __OS2__
    184185  getrusage (RUSAGE_SELF, &old_usage);
     186#endif
    185187
    186188  while (n_active_children > 0)
    187189    {
    … …  
    216218        }
    217219    }
    218220
     221#ifndef __OS2__
    219222  getrusage (RUSAGE_SELF, &new_usage);
     223#endif
    220224
    221225  printf ("Elapsed user: %g\n",
    222226           difftimeval (&old_usage.ru_utime, &new_usage.ru_utime));

  • tests/timeloop-closure.c 

    diff -ur glib-2.18.4-o/tests/timeloop-closure.c glib-2.18.4/tests/timeloop-closure.c
    old new  
    201201  for (i = 0; i < n_children; i++)
    202202    create_child ();
    203203
     204#ifndef __OS2__
    204205  getrusage (RUSAGE_SELF, &old_usage);
     206#endif
    205207  loop = g_main_loop_new (NULL, FALSE);
    206208  g_main_loop_run (loop);
     209#ifndef __OS2__
    207210  getrusage (RUSAGE_SELF, &new_usage);
     211#endif
    208212
    209213  printf ("Elapsed user: %g\n",
    210214          difftimeval (&old_usage.ru_utime, &new_usage.ru_utime));

  • tests/timeloop.c 

    diff -ur glib-2.18.4-o/tests/timeloop.c glib-2.18.4/tests/timeloop.c
    old new  
    195195  for (i = 0; i < n_children; i++)
    196196    create_child ();
    197197
     198#ifndef __OS2__
    198199  getrusage (RUSAGE_SELF, &old_usage);
     200#endif
    199201  loop = g_main_loop_new (NULL, FALSE);
    200202  g_main_loop_run (loop);
     203#ifndef __OS2__
    201204  getrusage (RUSAGE_SELF, &new_usage);
     205#endif
    202206
    203207  printf ("Elapsed user: %g\n",
    204208          difftimeval (&old_usage.ru_utime, &new_usage.ru_utime));