From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Chris Zheng Newsgroups: gmane.emacs.bugs Subject: bug#29848: 27.0.50; [PATCH] Loading missing json_object_get on MS-Windows Date: Tue, 26 Dec 2017 00:33:43 +0800 Message-ID: <86fu7y3gyg.wl-chriszheng99@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1514219598 15947 195.159.176.226 (25 Dec 2017 16:33:18 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 25 Dec 2017 16:33:18 +0000 (UTC) User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (=?UTF-8?Q?Goj=C5=8D?=) APEL/10.8 EasyPG/1.0.0 Emacs/27.0 (x86_64-w64-mingw32) MULE/6.0 (HANACHIRUSATO) To: 29848@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Dec 25 17:33:14 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eTVge-0003Ye-HE for geb-bug-gnu-emacs@m.gmane.org; Mon, 25 Dec 2017 17:33:12 +0100 Original-Received: from localhost ([::1]:54014 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eTVib-0005J1-A1 for geb-bug-gnu-emacs@m.gmane.org; Mon, 25 Dec 2017 11:35:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eTViV-0005Ir-NL for bug-gnu-emacs@gnu.org; Mon, 25 Dec 2017 11:35:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eTViQ-0006ii-Q3 for bug-gnu-emacs@gnu.org; Mon, 25 Dec 2017 11:35:07 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:43310) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eTViQ-0006ia-Ln for bug-gnu-emacs@gnu.org; Mon, 25 Dec 2017 11:35:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eTViQ-00066l-GU for bug-gnu-emacs@gnu.org; Mon, 25 Dec 2017 11:35:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Chris Zheng Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 25 Dec 2017 16:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 29848 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.151421964723412 (code B ref -1); Mon, 25 Dec 2017 16:35:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 25 Dec 2017 16:34:07 +0000 Original-Received: from localhost ([127.0.0.1]:51991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eTVhW-00065Y-Sd for submit@debbugs.gnu.org; Mon, 25 Dec 2017 11:34:07 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:55401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eTVhV-000654-Aw for submit@debbugs.gnu.org; Mon, 25 Dec 2017 11:34:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eTVhP-00061W-Hy for submit@debbugs.gnu.org; Mon, 25 Dec 2017 11:34:00 -0500 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:59290) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eTVhP-00061N-EO for submit@debbugs.gnu.org; Mon, 25 Dec 2017 11:33:59 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eTVhO-00058k-DH for bug-gnu-emacs@gnu.org; Mon, 25 Dec 2017 11:33:59 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eTVhJ-0005ys-Gz for bug-gnu-emacs@gnu.org; Mon, 25 Dec 2017 11:33:58 -0500 Original-Received: from mail-pl0-x231.google.com ([2607:f8b0:400e:c01::231]:38818) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eTVhJ-0005yB-CN for bug-gnu-emacs@gnu.org; Mon, 25 Dec 2017 11:33:53 -0500 Original-Received: by mail-pl0-x231.google.com with SMTP id s10so16812206plj.5 for ; Mon, 25 Dec 2017 08:33:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:from:to:subject:user-agent:mime-version :content-transfer-encoding; bh=Yf0BabMtvM7zncsACLvcHHG2bz/US1AiBc0DQ2x5sO0=; b=J62+y1xb8Ey+0ASd4FIiyTMpLmUxPrdgAtLGs3+6w0xuM6d9w2eaoN0jSMZoJqPYV0 P6q+uQk3b5C4k/LIPpq7Fkn9YwrT7vNUmmLHF3Gq05id4YJ3PH06jsc7LxoMFGgGnDj0 Ae93QujZEPigdH8jGLkOrNTkpT31YXYSEGrNuxfcMz8SzfFygJ/+zyJl7z5LxAAQS30i KFCk4XVBowGbOFEjlfVBrM3v4/K7wlq2sRjcZOYktN8kPPYQQiiuwHIjZ8jL9CsoIeT5 1Cy0evf2yab+WSvdTyu9ZsVSJwGOcEyaDseKFryqy7bOQH2ZNb0ouBHVU9DpvK1uB8Mj +3jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:from:to:subject:user-agent :mime-version:content-transfer-encoding; bh=Yf0BabMtvM7zncsACLvcHHG2bz/US1AiBc0DQ2x5sO0=; b=OeMbq6cQCwk+w1PK+77wtfiHfqBiJWfaSHYR7wh23a/4kwY55/+bffq76hdiKXfigL f6ZKhfpa0HHYa0EdfYGrig1XGr2sMxRi9ZKOZlHHMpNt0nROJmVlk0fikhGR34tCOOOY bPu2/nZAj5XAcCX8zCI/FQpGJksTy7H7wMtb8ghTLn/kTfzT7Ig1foqxKoSvxPHI6yqj PTGn82JHRq03qsQpPEIvUvw7dzE1UlrRp4+R6fe5Qe648YX6ibcUvkawT6C40plKTt8N Tuiv3JS04xdL2soINOPRkoZ3uTQLxWP3M/BXILSZFZOWrIPavYzdNaMNouqIeYqEbVej M45w== X-Gm-Message-State: AKGB3mICqBu1IxrzlrfMM7YVeTvBwAy3NsqDzTrli4+uqKsUOVEt13y3 OtfrstTYCsG11tp4/kSMl6SI8w== X-Google-Smtp-Source: ACJfBos7+9Ipqsls3IcisyI4u//VCh7pCytZau48tb10KnCZvpflquxaIU0FwBFkQx0X9giOTieCVg== X-Received: by 10.84.131.79 with SMTP id 73mr23359417pld.246.1514219632081; Mon, 25 Dec 2017 08:33:52 -0800 (PST) Original-Received: from Kael.gmail.com (23.106.135.97.16clouds.com. [23.106.135.97]) by smtp.gmail.com with ESMTPSA id z86sm61063715pff.4.2017.12.25.08.33.49 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Dec 2017 08:33:50 -0800 (PST) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:141489 Archived-At: In master branch, with commit 3455192777459a08a38b0adb311a76202e29f48d, the function json_object_get was called, which makes the build fail on MinGW-w64. The following patch loads the missing function. Could you please review and commit. Thank you. =46rom ce54808800aed7c0b1eaa7170db47b1bf6c03ae1 Mon Sep 17 00:00:00 2001 From: Chris Zheng Date: Mon, 25 Dec 2017 23:56:13 +0800 Subject: [PATCH] Loading missing json_object_get on MS-Windows * src/json.c [WINDOWSNT]: Define fn_json_object_get pointer. (init_json_functions) [WINDOWSNT]: Load json_object_get. --- src/json.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/json.c b/src/json.c index f615c4269f..88db86ad2e 100644 --- a/src/json.c +++ b/src/json.c @@ -60,6 +60,7 @@ DEF_DLL_FN (double, json_real_value, (const json_t *real)= ); DEF_DLL_FN (const char *, json_string_value, (const json_t *string)); DEF_DLL_FN (size_t, json_string_length, (const json_t *string)); DEF_DLL_FN (json_t *, json_array_get, (const json_t *array, size_t index)); +DEF_DLL_FN (json_t *, json_object_get, (const json_t *object, const char *= key)); DEF_DLL_FN (size_t, json_object_size, (const json_t *object)); DEF_DLL_FN (const char *, json_object_iter_key, (void *iter)); DEF_DLL_FN (void *, json_object_iter, (json_t *object)); @@ -108,6 +109,7 @@ init_json_functions (void) LOAD_DLL_FN (library, json_string_value); LOAD_DLL_FN (library, json_string_length); LOAD_DLL_FN (library, json_array_get); + LOAD_DLL_FN (library, json_object_get); LOAD_DLL_FN (library, json_object_size); LOAD_DLL_FN (library, json_object_iter_key); LOAD_DLL_FN (library, json_object_iter); @@ -141,6 +143,7 @@ init_json_functions (void) #define json_string_value fn_json_string_value #define json_string_length fn_json_string_length #define json_array_get fn_json_array_get +#define json_object_get fn_json_object_get #define json_object_size fn_json_object_size #define json_object_iter_key fn_json_object_iter_key #define json_object_iter fn_json_object_iter --=20 2.15.1.windows.2