From 1da99396dc65993ba34ac0370ca5d6acda6a3322 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 18 Mar 2018 07:02:37 -0400 Subject: [PATCH] Add support for gdbm-1.14. As of gdbm-1.14, 'gdbm_errno' no longer exists as a binary interface. It has been replaced by 'gdbm_errno_location', a function that returns int*. We now use this new interface if it's available. --- gdbm.scm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/gdbm.scm b/gdbm.scm index b92992f..4d38cc3 100644 --- a/gdbm.scm +++ b/gdbm.scm @@ -17,6 +17,9 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program. If not, see . +;; Modified by Mark H Weaver in March 2018 to support +;; gdbm-1.14 with its new 'gdbm_errno_location' interface. + (define-module (gdbm) #:use-module (system foreign) #:use-module (rnrs bytevectors) @@ -151,10 +154,21 @@ ;;; errors -(define %errno (dynamic-pointer "gdbm_errno" libgdbm)) +(define %list-int + (list int)) + +(define (dereference-int ptr) + (apply (lambda (errno) errno) + (parse-c-struct ptr %list-int))) + +(define %errno-location + (or (false-if-exception + (let ((func (dynamic-func "gdbm_errno_location" libgdbm))) + (pointer->procedure '* func '()))) + (const (dynamic-pointer "gdbm_errno" libgdbm)))) (define (gdbm-errno) - (pointer-address (dereference-pointer %errno))) + (dereference-int (%errno-location))) (define (gdbm-error) (error (pointer->string (%gdbm-strerror (gdbm-errno))))) -- 2.16.2 ue='297e88edff2b532a0ebf6bab846677c08e4e19b4'/>
AgeCommit message (Expand)Author
2023-03-07services: ladspa: Export accessors....* gnu/service/sound.scm: Export ladspa-configuration? and ladspa-configuration-plugins. (<ladspa-configuration>)[plugins]: Rename accessor to ladspa-configuration-plugins. (ladspa-environment): Adjust to use renamed plugin accessor. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Bruno Victal
2023-03-07services: alsa: Export accessors....* gnu/services/sound.scm: Export alsa-configuration?, alsa-configuration-alsa-plugins, alsa-configuration-pulseaudio? and alsa-configuration-extra-options. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Bruno Victal
2023-03-07services: pulseaudio: Export accessors....* gnu/services/sound.scm: Export pulseaudio-configuration?, pulseaudio-configuration-client-conf, pulseaudio-configuration-daemon-conf, pulseaudio-configuration-script-file, pulseaudio-configuration-extra-script-files and pulseaudio-configuration-system-script-file. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Bruno Victal
2022-12-28services: pulseaudio: Fix /etc/pulse/default.pa not being used....Fixes <https://issues.guix.gnu.org/60383>. * gnu/services/sound.scm (pulseaudio-etc): Produce daemon.conf unconditionally, with the correct default-script-file location. Produce client.conf unconditionally. Reported-by: Bruno Victal <mirai@makinata.eu> Maxim Cournoyer