@img/sharp-libvips-dev-wasm32 1.3.2 → 1.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (216) hide show
  1. package/include/expat.h +3 -1
  2. package/include/expat_config.h +3 -3
  3. package/include/expat_external.h +2 -0
  4. package/include/ffi.h +39 -5
  5. package/include/glib-2.0/gio/gaction.h +1 -1
  6. package/include/glib-2.0/gio/gactiongroup.h +1 -1
  7. package/include/glib-2.0/gio/gactionmap.h +1 -1
  8. package/include/glib-2.0/gio/gappinfo.h +2 -2
  9. package/include/glib-2.0/gio/gapplication.h +1 -1
  10. package/include/glib-2.0/gio/gapplicationcommandline.h +1 -1
  11. package/include/glib-2.0/gio/gasyncinitable.h +1 -1
  12. package/include/glib-2.0/gio/gasyncresult.h +1 -1
  13. package/include/glib-2.0/gio/gbufferedinputstream.h +1 -1
  14. package/include/glib-2.0/gio/gbufferedoutputstream.h +1 -1
  15. package/include/glib-2.0/gio/gbytesicon.h +1 -1
  16. package/include/glib-2.0/gio/gcancellable.h +1 -1
  17. package/include/glib-2.0/gio/gcharsetconverter.h +1 -1
  18. package/include/glib-2.0/gio/gconverter.h +1 -1
  19. package/include/glib-2.0/gio/gconverterinputstream.h +1 -1
  20. package/include/glib-2.0/gio/gconverteroutputstream.h +1 -1
  21. package/include/glib-2.0/gio/gcredentials.h +1 -1
  22. package/include/glib-2.0/gio/gdatainputstream.h +1 -1
  23. package/include/glib-2.0/gio/gdataoutputstream.h +1 -1
  24. package/include/glib-2.0/gio/gdbusactiongroup.h +2 -13
  25. package/include/glib-2.0/gio/gdbusauthobserver.h +1 -1
  26. package/include/glib-2.0/gio/gdbusconnection.h +1 -1
  27. package/include/glib-2.0/gio/gdbusinterface.h +1 -1
  28. package/include/glib-2.0/gio/gdbusinterfaceskeleton.h +1 -1
  29. package/include/glib-2.0/gio/gdbusintrospection.h +7 -7
  30. package/include/glib-2.0/gio/gdbusmenumodel.h +1 -1
  31. package/include/glib-2.0/gio/gdbusmessage.h +1 -1
  32. package/include/glib-2.0/gio/gdbusmethodinvocation.h +1 -1
  33. package/include/glib-2.0/gio/gdbusobject.h +1 -1
  34. package/include/glib-2.0/gio/gdbusobjectmanager.h +1 -1
  35. package/include/glib-2.0/gio/gdbusobjectmanagerclient.h +1 -1
  36. package/include/glib-2.0/gio/gdbusobjectmanagerserver.h +1 -1
  37. package/include/glib-2.0/gio/gdbusobjectproxy.h +1 -1
  38. package/include/glib-2.0/gio/gdbusobjectskeleton.h +1 -1
  39. package/include/glib-2.0/gio/gdbusproxy.h +1 -1
  40. package/include/glib-2.0/gio/gdbusserver.h +1 -1
  41. package/include/glib-2.0/gio/gdrive.h +1 -1
  42. package/include/glib-2.0/gio/gdtlsclientconnection.h +1 -1
  43. package/include/glib-2.0/gio/gdtlsconnection.h +1 -1
  44. package/include/glib-2.0/gio/gdtlsserverconnection.h +1 -1
  45. package/include/glib-2.0/gio/gemblem.h +2 -11
  46. package/include/glib-2.0/gio/gemblemedicon.h +1 -1
  47. package/include/glib-2.0/gio/gfile.h +1 -1
  48. package/include/glib-2.0/gio/gfileenumerator.h +1 -1
  49. package/include/glib-2.0/gio/gfileicon.h +1 -1
  50. package/include/glib-2.0/gio/gfileinfo.h +2 -2
  51. package/include/glib-2.0/gio/gfileinputstream.h +1 -1
  52. package/include/glib-2.0/gio/gfileiostream.h +1 -1
  53. package/include/glib-2.0/gio/gfilemonitor.h +1 -1
  54. package/include/glib-2.0/gio/gfilenamecompleter.h +1 -1
  55. package/include/glib-2.0/gio/gfileoutputstream.h +1 -1
  56. package/include/glib-2.0/gio/gfilterinputstream.h +1 -1
  57. package/include/glib-2.0/gio/gfilteroutputstream.h +1 -1
  58. package/include/glib-2.0/gio/gicon.h +1 -1
  59. package/include/glib-2.0/gio/ginetaddress.h +1 -1
  60. package/include/glib-2.0/gio/ginetaddressmask.h +1 -1
  61. package/include/glib-2.0/gio/ginetsocketaddress.h +1 -1
  62. package/include/glib-2.0/gio/ginitable.h +1 -1
  63. package/include/glib-2.0/gio/ginputstream.h +1 -1
  64. package/include/glib-2.0/gio/gio-autocleanups.h +0 -2
  65. package/include/glib-2.0/gio/gioenums.h +29 -10
  66. package/include/glib-2.0/gio/gioenumtypes.h +83 -83
  67. package/include/glib-2.0/gio/giomodule.h +1 -1
  68. package/include/glib-2.0/gio/giostream.h +1 -1
  69. package/include/glib-2.0/gio/gloadableicon.h +1 -1
  70. package/include/glib-2.0/gio/gmemoryinputstream.h +1 -1
  71. package/include/glib-2.0/gio/gmemoryoutputstream.h +1 -1
  72. package/include/glib-2.0/gio/gmenu.h +2 -2
  73. package/include/glib-2.0/gio/gmenumodel.h +3 -3
  74. package/include/glib-2.0/gio/gmount.h +1 -1
  75. package/include/glib-2.0/gio/gmountoperation.h +1 -1
  76. package/include/glib-2.0/gio/gnativesocketaddress.h +1 -1
  77. package/include/glib-2.0/gio/gnativevolumemonitor.h +1 -1
  78. package/include/glib-2.0/gio/gnetworkaddress.h +1 -1
  79. package/include/glib-2.0/gio/gnetworkmonitor.h +1 -1
  80. package/include/glib-2.0/gio/gnetworkservice.h +1 -1
  81. package/include/glib-2.0/gio/gnotification.h +1 -1
  82. package/include/glib-2.0/gio/goutputstream.h +1 -1
  83. package/include/glib-2.0/gio/gpollableinputstream.h +1 -1
  84. package/include/glib-2.0/gio/gpollableoutputstream.h +1 -1
  85. package/include/glib-2.0/gio/gpropertyaction.h +1 -1
  86. package/include/glib-2.0/gio/gproxy.h +1 -1
  87. package/include/glib-2.0/gio/gproxyaddress.h +1 -1
  88. package/include/glib-2.0/gio/gproxyaddressenumerator.h +1 -1
  89. package/include/glib-2.0/gio/gproxyresolver.h +1 -1
  90. package/include/glib-2.0/gio/gremoteactiongroup.h +1 -1
  91. package/include/glib-2.0/gio/gresolver.h +1 -1
  92. package/include/glib-2.0/gio/gresource.h +1 -1
  93. package/include/glib-2.0/gio/gseekable.h +1 -1
  94. package/include/glib-2.0/gio/gsettingsschema.h +3 -3
  95. package/include/glib-2.0/gio/gsimpleaction.h +1 -1
  96. package/include/glib-2.0/gio/gsimpleactiongroup.h +1 -1
  97. package/include/glib-2.0/gio/gsimpleasyncresult.h +1 -1
  98. package/include/glib-2.0/gio/gsimpleiostream.h +1 -1
  99. package/include/glib-2.0/gio/gsimpleproxyresolver.h +1 -1
  100. package/include/glib-2.0/gio/gsocket.h +1 -1
  101. package/include/glib-2.0/gio/gsocketaddress.h +1 -1
  102. package/include/glib-2.0/gio/gsocketaddressenumerator.h +1 -1
  103. package/include/glib-2.0/gio/gsocketclient.h +1 -1
  104. package/include/glib-2.0/gio/gsocketconnectable.h +1 -1
  105. package/include/glib-2.0/gio/gsocketconnection.h +1 -1
  106. package/include/glib-2.0/gio/gsocketcontrolmessage.h +1 -1
  107. package/include/glib-2.0/gio/gsocketlistener.h +1 -1
  108. package/include/glib-2.0/gio/gsrvtarget.h +1 -1
  109. package/include/glib-2.0/gio/gsubprocess.h +1 -1
  110. package/include/glib-2.0/gio/gsubprocesslauncher.h +1 -1
  111. package/include/glib-2.0/gio/gtask.h +1 -1
  112. package/include/glib-2.0/gio/gtcpconnection.h +1 -1
  113. package/include/glib-2.0/gio/gtcpwrapperconnection.h +1 -1
  114. package/include/glib-2.0/gio/gtestdbus.h +1 -1
  115. package/include/glib-2.0/gio/gthemedicon.h +1 -1
  116. package/include/glib-2.0/gio/gtlsbackend.h +1 -1
  117. package/include/glib-2.0/gio/gtlscertificate.h +1 -1
  118. package/include/glib-2.0/gio/gtlsclientconnection.h +1 -1
  119. package/include/glib-2.0/gio/gtlsconnection.h +1 -1
  120. package/include/glib-2.0/gio/gtlsdatabase.h +1 -1
  121. package/include/glib-2.0/gio/gtlsfiledatabase.h +1 -1
  122. package/include/glib-2.0/gio/gtlsinteraction.h +1 -1
  123. package/include/glib-2.0/gio/gtlspassword.h +1 -1
  124. package/include/glib-2.0/gio/gtlsserverconnection.h +1 -1
  125. package/include/glib-2.0/gio/gunixcredentialsmessage.h +1 -1
  126. package/include/glib-2.0/gio/gunixfdlist.h +24 -12
  127. package/include/glib-2.0/gio/gunixsocketaddress.h +1 -1
  128. package/include/glib-2.0/gio/gvfs.h +1 -1
  129. package/include/glib-2.0/gio/gvolume.h +1 -1
  130. package/include/glib-2.0/gio/gvolumemonitor.h +1 -1
  131. package/include/glib-2.0/gio/gzlibcompressor.h +1 -1
  132. package/include/glib-2.0/gio/gzlibdecompressor.h +1 -1
  133. package/include/glib-2.0/glib/gdatetime.h +61 -0
  134. package/include/glib-2.0/glib/giochannel.h +34 -0
  135. package/include/glib-2.0/glib/gkeyfile.h +12 -0
  136. package/include/glib-2.0/glib/gmain.h +12 -0
  137. package/include/glib-2.0/glib/gmarkup.h +8 -2
  138. package/include/glib-2.0/glib/gmem.h +20 -20
  139. package/include/glib-2.0/glib/gquark.h +1 -1
  140. package/include/glib-2.0/glib/grefcount.h +5 -5
  141. package/include/glib-2.0/glib/gslice.h +5 -5
  142. package/include/glib-2.0/glib/gspawn.h +0 -6
  143. package/include/glib-2.0/glib/gstrfuncs.h +24 -24
  144. package/include/glib-2.0/glib/gstring.h +6 -4
  145. package/include/glib-2.0/glib/gtestutils.h +111 -76
  146. package/include/glib-2.0/glib/gtypes.h +56 -56
  147. package/include/glib-2.0/glib/gunicode.h +138 -24
  148. package/include/glib-2.0/glib/gutils.h +34 -0
  149. package/include/glib-2.0/gobject/gbinding.h +2 -2
  150. package/include/glib-2.0/gobject/gbindinggroup.h +1 -1
  151. package/include/glib-2.0/gobject/gboxed.h +2 -2
  152. package/include/glib-2.0/gobject/glib-enumtypes.h +4 -4
  153. package/include/glib-2.0/gobject/glib-types.h +37 -37
  154. package/include/glib-2.0/gobject/gobject.h +1 -1
  155. package/include/glib-2.0/gobject/gsignal.h +7 -1
  156. package/include/glib-2.0/gobject/gsignalgroup.h +1 -1
  157. package/include/glib-2.0/gobject/gtype.h +31 -25
  158. package/include/glib-2.0/gobject/gtypemodule.h +1 -1
  159. package/include/glib-2.0/gobject/gtypeplugin.h +1 -1
  160. package/include/glib-2.0/gobject/gvaluearray.h +1 -1
  161. package/include/glib-2.0/gobject/gvaluecollector.h +12 -12
  162. package/include/libheif/heif_image.h +7 -0
  163. package/include/libheif/heif_image_handle.h +16 -0
  164. package/include/libheif/heif_regions.h +5 -1
  165. package/include/libheif/heif_version.h +2 -2
  166. package/include/resvg.h +4 -3
  167. package/include/tiffvers.h +1 -1
  168. package/include/ultrahdr_api.h +20 -5
  169. package/include/vips/enumtypes.h +55 -55
  170. package/include/vips/version.h +4 -4
  171. package/lib/glib-2.0/include/glibconfig.h +1 -1
  172. package/lib/libaom.a +0 -0
  173. package/lib/libcgif.a +0 -0
  174. package/lib/libexif.a +0 -0
  175. package/lib/libexpat.a +0 -0
  176. package/lib/libexpat.la +1 -1
  177. package/lib/libffi.a +0 -0
  178. package/lib/libffi.la +3 -3
  179. package/lib/libgio-2.0.a +0 -0
  180. package/lib/libglib-2.0.a +0 -0
  181. package/lib/libgmodule-2.0.a +0 -0
  182. package/lib/libgobject-2.0.a +0 -0
  183. package/lib/libgthread-2.0.a +0 -0
  184. package/lib/libheif.a +0 -0
  185. package/lib/libhwy.a +0 -0
  186. package/lib/libimagequant.a +0 -0
  187. package/lib/libjpeg.a +0 -0
  188. package/lib/liblcms2.a +0 -0
  189. package/lib/libpng.a +0 -0
  190. package/lib/libpng16.a +0 -0
  191. package/lib/libresvg.a +0 -0
  192. package/lib/libsharpyuv.a +0 -0
  193. package/lib/libtiff.a +0 -0
  194. package/lib/libuhdr.a +0 -0
  195. package/lib/libvips-cpp.a +0 -0
  196. package/lib/libvips.a +0 -0
  197. package/lib/libwebp.a +0 -0
  198. package/lib/libwebpdecoder.a +0 -0
  199. package/lib/libwebpdemux.a +0 -0
  200. package/lib/libwebpmux.a +0 -0
  201. package/lib/libz.a +0 -0
  202. package/lib/pkgconfig/expat.pc +1 -1
  203. package/lib/pkgconfig/gio-2.0.pc +1 -1
  204. package/lib/pkgconfig/glib-2.0.pc +1 -1
  205. package/lib/pkgconfig/gmodule-2.0.pc +1 -1
  206. package/lib/pkgconfig/gmodule-export-2.0.pc +1 -1
  207. package/lib/pkgconfig/gmodule-no-export-2.0.pc +1 -1
  208. package/lib/pkgconfig/gobject-2.0.pc +1 -1
  209. package/lib/pkgconfig/gthread-2.0.pc +1 -1
  210. package/lib/pkgconfig/libffi.pc +1 -1
  211. package/lib/pkgconfig/libheif.pc +1 -1
  212. package/lib/pkgconfig/libuhdr.pc +1 -1
  213. package/lib/pkgconfig/vips-cpp.pc +1 -1
  214. package/lib/pkgconfig/vips.pc +1 -1
  215. package/package.json +1 -1
  216. package/versions.json +9 -9
@@ -47,7 +47,7 @@ struct _GZlibDecompressorClass
47
47
  };
48
48
 
49
49
  GIO_AVAILABLE_IN_ALL
50
- GType g_zlib_decompressor_get_type (void) G_GNUC_CONST;
50
+ GType g_zlib_decompressor_get_type (void);
51
51
 
52
52
  GIO_AVAILABLE_IN_ALL
53
53
  GZlibDecompressor *g_zlib_decompressor_new (GZlibCompressorFormat format);
@@ -302,6 +302,67 @@ gchar * g_date_time_format (GDateTi
302
302
  GLIB_AVAILABLE_IN_2_62
303
303
  gchar * g_date_time_format_iso8601 (GDateTime *datetime) G_GNUC_MALLOC;
304
304
 
305
+ /**
306
+ * g_set_date_time: (skip)
307
+ * @date_time_pointer: (inout) (not optional) (nullable): a pointer to either
308
+ * a date-time or `NULL`
309
+ * @new_date_time: (nullable): a date-time to assign to @date_time_pointer
310
+ *
311
+ * Updates a pointer to a date-time to @new_date_time and returns whether
312
+ * @date_time_pointer was changed.
313
+ *
314
+ * If @new_date_time matches the previous date time, this function is a no-op.
315
+ * If @new_date_time is different, its ref-count will be increased and it will
316
+ * be assigned to @date_time_pointer.
317
+ * The previous date time pointed to by @date_time_pointer will have its
318
+ * ref-count decreased.
319
+ *
320
+ * Note two date-time objects that represent the same instant in different
321
+ * timezones are not considered equal.
322
+ *
323
+ * @date_time_pointer must not be `NULL`, but can point to a `NULL` value.
324
+ *
325
+ * Returns: true if the value of @date_time_pointer changed, false otherwise
326
+ *
327
+ * Since: 2.90
328
+ */
329
+ GLIB_AVAILABLE_STATIC_INLINE_IN_2_90
330
+ static inline gboolean g_set_date_time (GDateTime **date_time_pointer,
331
+ GDateTime *new_date_time);
332
+
333
+ GLIB_AVAILABLE_STATIC_INLINE_IN_2_90
334
+ static inline gboolean
335
+ g_set_date_time (GDateTime **date_time_pointer,
336
+ GDateTime *new_date_time)
337
+ {
338
+ GDateTime *old_date_time;
339
+
340
+ if (*date_time_pointer == new_date_time ||
341
+ (*date_time_pointer != NULL &&
342
+ new_date_time != NULL &&
343
+ g_date_time_compare (*date_time_pointer, new_date_time) == 0 &&
344
+ (g_date_time_get_timezone_abbreviation (*date_time_pointer) ==
345
+ g_date_time_get_timezone_abbreviation (new_date_time))))
346
+ {
347
+ return FALSE;
348
+ }
349
+
350
+ if (new_date_time != NULL)
351
+ {
352
+ g_date_time_ref (new_date_time);
353
+ }
354
+
355
+ old_date_time = *date_time_pointer;
356
+ *date_time_pointer = new_date_time;
357
+
358
+ if (old_date_time != NULL)
359
+ {
360
+ g_date_time_unref (old_date_time);
361
+ }
362
+
363
+ return TRUE;
364
+ }
365
+
305
366
  G_END_DECLS
306
367
 
307
368
  #endif /* __G_DATE_TIME_H__ */
@@ -83,8 +83,42 @@ typedef enum
83
83
  G_SEEK_END
84
84
  } GSeekType;
85
85
 
86
+ /**
87
+ * GIOFlags:
88
+ * @G_IO_FLAG_APPEND: Turns on append mode, corresponds to %O_APPEND
89
+ * (see the documentation of the UNIX open() syscall)
90
+ * @G_IO_FLAG_NONBLOCK: Turns on nonblocking mode, corresponds to
91
+ * %O_NONBLOCK/%O_NDELAY (see the documentation of the UNIX open()
92
+ * syscall)
93
+ * @G_IO_FLAG_IS_READABLE: Indicates that the io channel is readable.
94
+ * This flag cannot be changed.
95
+ * @G_IO_FLAG_IS_WRITABLE: Indicates that the io channel is writable.
96
+ * This flag cannot be changed.
97
+ * @G_IO_FLAG_IS_WRITEABLE: A misspelled version of @G_IO_FLAG_IS_WRITABLE
98
+ * that existed before the spelling was fixed in GLib 2.30. It is kept
99
+ * here for compatibility reasons. Deprecated since 2.30
100
+ * @G_IO_FLAG_IS_SEEKABLE: Indicates that the io channel is seekable,
101
+ * i.e. that g_io_channel_seek_position() can be used on it.
102
+ * This flag cannot be changed.
103
+ * @G_IO_FLAG_MASK: The mask that specifies all the valid flags.
104
+ * @G_IO_FLAG_GET_MASK: The mask of the flags that are returned from
105
+ * g_io_channel_get_flags()
106
+ * @G_IO_FLAG_SET_MASK: The mask of the flags that the user can modify
107
+ * with g_io_channel_set_flags()
108
+ *
109
+ * Specifies properties of a #GIOChannel. Some of the flags can only be
110
+ * read with g_io_channel_get_flags(), but not changed with
111
+ * g_io_channel_set_flags().
112
+ */
86
113
  typedef enum
87
114
  {
115
+ /**
116
+ * G_IO_FLAG_NONE:
117
+ *
118
+ * No special flags set.
119
+ *
120
+ * Since: 2.74
121
+ */
88
122
  G_IO_FLAG_NONE GLIB_AVAILABLE_ENUMERATOR_IN_2_74 = 0,
89
123
  G_IO_FLAG_APPEND = 1 << 0,
90
124
  G_IO_FLAG_NONBLOCK = 1 << 1,
@@ -78,6 +78,18 @@ gboolean g_key_file_load_from_data (GKeyFile *key_file,
78
78
  gsize length,
79
79
  GKeyFileFlags flags,
80
80
  GError **error);
81
+
82
+ GLIB_AVAILABLE_IN_2_90
83
+ gboolean g_key_file_load_unix_configurations (GKeyFile *key_file,
84
+ const gchar *project,
85
+ const gchar *etc_subdir,
86
+ const gchar *run_subdir,
87
+ const gchar *usr_subdir,
88
+ const gchar *config_name,
89
+ const gchar *config_suffix,
90
+ GKeyFileFlags flags,
91
+ GError **error);
92
+
81
93
  GLIB_AVAILABLE_IN_2_50
82
94
  gboolean g_key_file_load_from_bytes (GKeyFile *key_file,
83
95
  GBytes *bytes,
@@ -759,8 +759,16 @@ void g_source_set_name_by_id (guint tag,
759
759
  GLIB_AVAILABLE_IN_2_36
760
760
  void g_source_set_ready_time (GSource *source,
761
761
  gint64 ready_time);
762
+ GLIB_AVAILABLE_IN_2_90
763
+ void g_source_set_ready_time_ns (GSource *source,
764
+ uint64_t ready_time);
765
+ GLIB_AVAILABLE_IN_2_90
766
+ void g_source_clear_ready_time (GSource *source);
762
767
  GLIB_AVAILABLE_IN_2_36
763
768
  gint64 g_source_get_ready_time (GSource *source);
769
+ GLIB_AVAILABLE_IN_2_90
770
+ gboolean g_source_get_ready_time_ns (GSource *source,
771
+ uint64_t *ready_time);
764
772
 
765
773
  #ifdef G_OS_UNIX
766
774
  GLIB_AVAILABLE_IN_2_36
@@ -807,6 +815,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS
807
815
 
808
816
  GLIB_AVAILABLE_IN_ALL
809
817
  gint64 g_source_get_time (GSource *source);
818
+ GLIB_AVAILABLE_IN_2_90
819
+ uint64_t g_source_get_time_ns (GSource *source);
810
820
 
811
821
  /* void g_source_connect_closure (GSource *source,
812
822
  GClosure *closure);
@@ -820,6 +830,8 @@ GLIB_AVAILABLE_IN_ALL
820
830
  GSource *g_child_watch_source_new (GPid pid);
821
831
  GLIB_AVAILABLE_IN_ALL
822
832
  GSource *g_timeout_source_new (guint interval);
833
+ GLIB_AVAILABLE_IN_2_90
834
+ GSource *g_timeout_source_new_ns (uint64_t interval);
823
835
  GLIB_AVAILABLE_IN_ALL
824
836
  GSource *g_timeout_source_new_seconds (guint interval);
825
837
 
@@ -76,8 +76,7 @@ GQuark g_markup_error_quark (void);
76
76
 
77
77
  /**
78
78
  * GMarkupParseFlags:
79
- * @G_MARKUP_DEFAULT_FLAGS: No special behaviour. Since: 2.74
80
- * @G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG: flag you should not use
79
+ * @G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG: Flag you should not use
81
80
  * @G_MARKUP_TREAT_CDATA_AS_TEXT: When this flag is set, CDATA marked
82
81
  * sections are not passed literally to the @passthrough function of
83
82
  * the parser. Instead, the content of the section (without the
@@ -97,6 +96,13 @@ GQuark g_markup_error_quark (void);
97
96
  */
98
97
  typedef enum
99
98
  {
99
+ /**
100
+ * G_MARKUP_DEFAULT_FLAGS:
101
+ *
102
+ * No special behaviour.
103
+ *
104
+ * Since: 2.74
105
+ */
100
106
  G_MARKUP_DEFAULT_FLAGS GLIB_AVAILABLE_ENUMERATOR_IN_2_74 = 0,
101
107
  G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG = 1 << 0,
102
108
  G_MARKUP_TREAT_CDATA_AS_TEXT = 1 << 1,
@@ -261,31 +261,31 @@ g_steal_pointer (gpointer pp)
261
261
  #if defined (__GNUC__) && (__GNUC__ >= 2) && defined (__OPTIMIZE__)
262
262
  # define _G_NEW(struct_type, n_structs, func) \
263
263
  (struct_type *) (G_GNUC_EXTENSION ({ \
264
- gsize __n = (gsize) (n_structs); \
265
- gsize __s = sizeof (struct_type); \
266
- gpointer __p; \
267
- if (__s == 1) \
268
- __p = g_##func (__n); \
269
- else if (__builtin_constant_p (__n) && \
270
- (__s == 0 || __n <= G_MAXSIZE / __s)) \
271
- __p = g_##func (__n * __s); \
264
+ gsize _n = (gsize) (n_structs); \
265
+ gsize _s = sizeof (struct_type); \
266
+ gpointer _p; \
267
+ if (_s == 1) \
268
+ _p = g_##func (_n); \
269
+ else if (__builtin_constant_p (_n) && \
270
+ (_s == 0 || _n <= G_MAXSIZE / _s)) \
271
+ _p = g_##func (_n * _s); \
272
272
  else \
273
- __p = g_##func##_n (__n, __s); \
274
- __p; \
273
+ _p = g_##func##_n (_n, _s); \
274
+ _p; \
275
275
  }))
276
276
  # define _G_RENEW(struct_type, mem, n_structs, func) \
277
277
  (struct_type *) (G_GNUC_EXTENSION ({ \
278
- gsize __n = (gsize) (n_structs); \
279
- gsize __s = sizeof (struct_type); \
280
- gpointer __p = (gpointer) (mem); \
281
- if (__s == 1) \
282
- __p = g_##func (__p, __n); \
283
- else if (__builtin_constant_p (__n) && \
284
- (__s == 0 || __n <= G_MAXSIZE / __s)) \
285
- __p = g_##func (__p, __n * __s); \
278
+ gsize _n = (gsize) (n_structs); \
279
+ gsize _s = sizeof (struct_type); \
280
+ gpointer _p = (gpointer) (mem); \
281
+ if (_s == 1) \
282
+ _p = g_##func (_p, _n); \
283
+ else if (__builtin_constant_p (_n) && \
284
+ (_s == 0 || _n <= G_MAXSIZE / _s)) \
285
+ _p = g_##func (_p, _n * _s); \
286
286
  else \
287
- __p = g_##func##_n (__p, __n, __s); \
288
- __p; \
287
+ _p = g_##func##_n (_p, _n, _s); \
288
+ _p; \
289
289
  }))
290
290
 
291
291
  #else
@@ -46,7 +46,7 @@ GQuark g_quark_from_static_string (const gchar *string);
46
46
  GLIB_AVAILABLE_IN_ALL
47
47
  GQuark g_quark_from_string (const gchar *string);
48
48
  GLIB_AVAILABLE_IN_ALL
49
- const gchar * g_quark_to_string (GQuark quark) G_GNUC_CONST;
49
+ const gchar * g_quark_to_string (GQuark quark) G_GNUC_PURE;
50
50
 
51
51
  #define G_DEFINE_QUARK(QN, q_n) \
52
52
  GQuark \
@@ -129,12 +129,12 @@ gboolean g_atomic_ref_count_compare (gatomicrefcount *arc,
129
129
  # define g_ref_count_dec(rc) \
130
130
  (G_GNUC_EXTENSION ({ \
131
131
  G_STATIC_ASSERT (sizeof *(rc) == sizeof (grefcount)); \
132
- grefcount __rc = *(rc); \
133
- __rc += 1; \
134
- if (__rc == 0) ; else { \
135
- *(rc) = __rc; \
132
+ grefcount _rc = *(rc); \
133
+ _rc += 1; \
134
+ if (_rc == 0) ; else { \
135
+ *(rc) = _rc; \
136
136
  } \
137
- (gboolean) (__rc == 0); \
137
+ (gboolean) (_rc == 0); \
138
138
  }))
139
139
 
140
140
  # define g_ref_count_compare(rc,val) \
@@ -60,11 +60,11 @@ void g_slice_free_chain_with_offset (gsize block_size,
60
60
  #if defined (__GNUC__) && (__GNUC__ >= 2) && defined (__OPTIMIZE__)
61
61
  # define g_slice_new0(type) \
62
62
  (type *) (G_GNUC_EXTENSION ({ \
63
- gsize __s = g_slice_alloc_size (type); \
64
- gpointer __p; \
65
- __p = g_slice_alloc (__s); \
66
- memset (__p, 0, __s); \
67
- __p; \
63
+ gsize _s = g_slice_alloc_size (type); \
64
+ gpointer _p; \
65
+ _p = g_slice_alloc (_s); \
66
+ memset (_p, 0, _s); \
67
+ _p; \
68
68
  }))
69
69
  #else
70
70
  # define g_slice_new0(type) ((type*) g_slice_alloc0 (g_slice_alloc_size (type)))
@@ -164,12 +164,6 @@ typedef void (* GSpawnChildSetupFunc) (gpointer data);
164
164
  * Since: 2.34
165
165
  * @G_SPAWN_CLOEXEC_PIPES: create all pipes with the `O_CLOEXEC` flag set.
166
166
  * Since: 2.40
167
- * @G_SPAWN_CHILD_INHERITS_STDOUT: the child will inherit the parent's standard output.
168
- * Since: 2.74
169
- * @G_SPAWN_CHILD_INHERITS_STDERR: the child will inherit the parent's standard error.
170
- * Since: 2.74
171
- * @G_SPAWN_STDIN_FROM_DEV_NULL: the child's standard input is attached to `/dev/null`.
172
- * Since: 2.74
173
167
  *
174
168
  * Flags passed to g_spawn_sync(), g_spawn_async() and g_spawn_async_with_pipes().
175
169
  */
@@ -159,22 +159,22 @@ gboolean (g_str_has_prefix) (const gchar *str,
159
159
  #define g_str_has_prefix(STR, PREFIX) \
160
160
  (__builtin_constant_p (PREFIX)? \
161
161
  G_GNUC_EXTENSION ({ \
162
- const char * const __str = (STR); \
163
- const char * const __prefix = (PREFIX); \
164
- gboolean __result = FALSE; \
162
+ const char * const _str = (STR); \
163
+ const char * const _prefix = (PREFIX); \
164
+ gboolean _result = FALSE; \
165
165
  \
166
- if G_UNLIKELY (__str == NULL || __prefix == NULL) \
167
- __result = (g_str_has_prefix) (__str, __prefix); \
166
+ if G_UNLIKELY (_str == NULL || _prefix == NULL) \
167
+ _result = (g_str_has_prefix) (_str, _prefix); \
168
168
  else \
169
169
  { \
170
- const size_t __str_len = strlen (_G_STR_NONNULL (__str)); \
171
- const size_t __prefix_len = strlen (_G_STR_NONNULL (__prefix)); \
172
- if (__str_len >= __prefix_len) \
173
- __result = memcmp (_G_STR_NONNULL (__str), \
174
- _G_STR_NONNULL (__prefix), \
175
- __prefix_len) == 0; \
170
+ const size_t _str_len = strlen (_G_STR_NONNULL (_str)); \
171
+ const size_t _prefix_len = strlen (_G_STR_NONNULL (_prefix)); \
172
+ if (_str_len >= _prefix_len) \
173
+ _result = memcmp (_G_STR_NONNULL (_str), \
174
+ _G_STR_NONNULL (_prefix), \
175
+ _prefix_len) == 0; \
176
176
  } \
177
- __result; \
177
+ _result; \
178
178
  }) \
179
179
  : \
180
180
  (g_str_has_prefix) (STR, PREFIX) \
@@ -183,22 +183,22 @@ gboolean (g_str_has_prefix) (const gchar *str,
183
183
  #define g_str_has_suffix(STR, SUFFIX) \
184
184
  (__builtin_constant_p (SUFFIX)? \
185
185
  G_GNUC_EXTENSION ({ \
186
- const char * const __str = (STR); \
187
- const char * const __suffix = (SUFFIX); \
188
- gboolean __result = FALSE; \
186
+ const char * const _str = (STR); \
187
+ const char * const _suffix = (SUFFIX); \
188
+ gboolean _result = FALSE; \
189
189
  \
190
- if G_UNLIKELY (__str == NULL || __suffix == NULL) \
191
- __result = (g_str_has_suffix) (__str, __suffix); \
190
+ if G_UNLIKELY (_str == NULL || _suffix == NULL) \
191
+ _result = (g_str_has_suffix) (_str, _suffix); \
192
192
  else \
193
193
  { \
194
- const size_t __str_len = strlen (_G_STR_NONNULL (__str)); \
195
- const size_t __suffix_len = strlen (_G_STR_NONNULL (__suffix)); \
196
- if (__str_len >= __suffix_len) \
197
- __result = memcmp (__str + __str_len - __suffix_len, \
198
- _G_STR_NONNULL (__suffix), \
199
- __suffix_len) == 0; \
194
+ const size_t _str_len = strlen (_G_STR_NONNULL (_str)); \
195
+ const size_t _suffix_len = strlen (_G_STR_NONNULL (_suffix)); \
196
+ if (_str_len >= _suffix_len) \
197
+ _result = memcmp (_str + _str_len - _suffix_len, \
198
+ _G_STR_NONNULL (_suffix), \
199
+ _suffix_len) == 0; \
200
200
  } \
201
- __result; \
201
+ _result; \
202
202
  }) \
203
203
  : \
204
204
  (g_str_has_suffix) (STR, SUFFIX) \
@@ -63,6 +63,8 @@ GString *g_string_copy (GString *string);
63
63
  GLIB_AVAILABLE_IN_ALL
64
64
  gchar* (g_string_free) (GString *string,
65
65
  gboolean free_segment);
66
+ GLIB_AVAILABLE_IN_2_90
67
+ void (g_string_free_deep) (GString *string);
66
68
  GLIB_AVAILABLE_IN_2_76
67
69
  gchar* g_string_free_and_steal (GString *string) G_GNUC_WARN_UNUSED_RESULT;
68
70
 
@@ -270,10 +272,10 @@ g_string_truncate_inline (GString *gstring,
270
272
  #define g_string_append(gstr, val) \
271
273
  (__builtin_constant_p (val) ? \
272
274
  G_GNUC_EXTENSION ({ \
273
- const char * const __val = (val); \
274
- g_string_append_len (gstr, __val, \
275
- G_LIKELY (__val != NULL) ? \
276
- (gssize) strlen (_G_STR_NONNULL (__val)) \
275
+ const char * const _val = (val); \
276
+ g_string_append_len (gstr, _val, \
277
+ G_LIKELY (_val != NULL) ? \
278
+ (gssize) strlen (_G_STR_NONNULL (_val)) \
277
279
  : (gssize) -1); \
278
280
  }) \
279
281
  : \