diff options
author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2019-07-17 14:46:31 +0200 |
---|---|---|
committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2019-07-17 14:46:31 +0200 |
commit | 95b747826ba2be82dece63e6cccfe9bf64832189 (patch) | |
tree | 1a2602f397ca54dbea4fd8f1ff8af4cb584798b7 /glib/src/glib_enums.defs | |
parent | 1edbf498e791f6202442a24c51704ee84f31456d (diff) | |
download | glibmm-95b747826ba2be82dece63e6cccfe9bf64832189.tar.gz |
Glib, Gio: Regenerate docs.xml and .defs files
and update gio_signals.defs.patch and generate_defs_gio.cc.
Diffstat (limited to 'glib/src/glib_enums.defs')
-rw-r--r-- | glib/src/glib_enums.defs | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/glib/src/glib_enums.defs b/glib/src/glib_enums.defs index a967468b..b0876fa9 100644 --- a/glib/src/glib_enums.defs +++ b/glib/src/glib_enums.defs @@ -1038,7 +1038,7 @@ '("left-paren" "G_TOKEN_LEFT_PAREN" "'('") '("right-paren" "G_TOKEN_RIGHT_PAREN" "')'") '("left-curly" "G_TOKEN_LEFT_CURLY" "'{'") - '("right-curly" "G_TOKEN_RIGHT_CURLY" "']'") + '("right-curly" "G_TOKEN_RIGHT_CURLY" "'}'") '("left-brace" "G_TOKEN_LEFT_BRACE" "'['") '("right-brace" "G_TOKEN_RIGHT_BRACE" "']'") '("equal-sign" "G_TOKEN_EQUAL_SIGN" "'='") @@ -1119,9 +1119,7 @@ ;; G_SPAWN_ERROR_ACCES, /* execv() returned EACCES */ ;; G_SPAWN_ERROR_PERM, /* execv() returned EPERM */ ;; G_SPAWN_ERROR_TOO_BIG,/* execv() returned E2BIG */ -;; #ifndef G_DISABLE_DEPRECATED -;; G_SPAWN_ERROR_2BIG = G_SPAWN_ERROR_TOO_BIG, -;; #endif +;; G_SPAWN_ERROR_2BIG GLIB_DEPRECATED_ENUMERATOR_IN_2_32_FOR(G_SPAWN_ERROR_TOO_BIG) = G_SPAWN_ERROR_TOO_BIG, ;; G_SPAWN_ERROR_NOEXEC, /* execv() returned ENOEXEC */ ;; G_SPAWN_ERROR_NAMETOOLONG, /* "" "" ENAMETOOLONG */ ;; G_SPAWN_ERROR_NOENT, /* "" "" ENOENT */ @@ -1260,7 +1258,7 @@ ;; G_TEST_TRAP_SILENCE_STDOUT = 1 << 7, ;; G_TEST_TRAP_SILENCE_STDERR = 1 << 8, ;; G_TEST_TRAP_INHERIT_STDIN = 1 << 9 -;; } GTestTrapFlags; +;; } GTestTrapFlags GLIB_DEPRECATED_TYPE_IN_2_38_FOR(GTestSubprocessFlags); (define-flags-extended TestTrapFlags (in-module "G") @@ -1717,7 +1715,7 @@ ;; G_UNICODE_SCRIPT_KHUDAWADI, /* Sind */ ;; G_UNICODE_SCRIPT_LINEAR_A, /* Lina */ ;; G_UNICODE_SCRIPT_MAHAJANI, /* Mahj */ -;; G_UNICODE_SCRIPT_MANICHAEAN, /* Manu */ +;; G_UNICODE_SCRIPT_MANICHAEAN, /* Mani */ ;; G_UNICODE_SCRIPT_MENDE_KIKAKUI, /* Mend */ ;; G_UNICODE_SCRIPT_MODI, /* Modi */ ;; G_UNICODE_SCRIPT_MRO, /* Mroo */ @@ -1761,7 +1759,13 @@ ;; G_UNICODE_SCRIPT_MAKASAR, /* Maka */ ;; G_UNICODE_SCRIPT_MEDEFAIDRIN, /* Medf */ ;; G_UNICODE_SCRIPT_OLD_SOGDIAN, /* Sogo */ -;; G_UNICODE_SCRIPT_SOGDIAN /* Sogd */ +;; G_UNICODE_SCRIPT_SOGDIAN, /* Sogd */ +;; +;; /* Unicode 12.0 additions */ +;; G_UNICODE_SCRIPT_ELYMAIC, /* Elym */ +;; G_UNICODE_SCRIPT_NANDINAGARI, /* Nand */ +;; G_UNICODE_SCRIPT_NYIAKENG_PUACHUE_HMONG, /* Rohg */ +;; G_UNICODE_SCRIPT_WANCHO /* Wcho */ ;; } GUnicodeScript; (define-enum-extended UnicodeScript @@ -1918,6 +1922,10 @@ '("medefaidrin" "G_UNICODE_SCRIPT_MEDEFAIDRIN" "146") '("old-sogdian" "G_UNICODE_SCRIPT_OLD_SOGDIAN" "147") '("sogdian" "G_UNICODE_SCRIPT_SOGDIAN" "148") + '("elymaic" "G_UNICODE_SCRIPT_ELYMAIC" "149") + '("nandinagari" "G_UNICODE_SCRIPT_NANDINAGARI" "150") + '("nyiakeng-puachue-hmong" "G_UNICODE_SCRIPT_NYIAKENG_PUACHUE_HMONG" "151") + '("wancho" "G_UNICODE_SCRIPT_WANCHO" "152") ) ) @@ -2127,7 +2135,7 @@ ;; G_THREAD_PRIORITY_NORMAL, ;; G_THREAD_PRIORITY_HIGH, ;; G_THREAD_PRIORITY_URGENT -;; } GThreadPriority; +;; } GThreadPriority GLIB_DEPRECATED_TYPE_IN_2_32; (define-enum-extended ThreadPriority (in-module "G") |