mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-09-14 03:35:05 +00:00
1012dc2933
We are so close to a release that we don't want to pull in a gnulib submodule update and risk regressions, since there has been a lot of other gnulib churn upstream. However, there are a couple of gnulib issues that are worth fixing in isolation, by applying local patches to gnulib. There was an upstream gnulib bug in maint.mk that rendered most of our syntax checks ineffective (and fixing it flushed out a minor bug in our code): https://lists.gnu.org/archive/html/bug-gnulib/2012-03/msg00194.html There is still an upstream bug where gnulib uses the wrong type for ssize_t on mingw; we need the fix now even though it has not yet been accepted into gnulib: https://lists.gnu.org/archive/html/bug-gnulib/2012-03/msg00188.html * gnulib/local/top/maint.mk.diff: Pick up upstream gnulib maint.mk. * gnulib/local/m4/ssize_t.m4.diff: Work around gnulib bug. * src/libvirt.c: Remove unused header. * cfg.mk (exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF): Exempt gnulib local files.
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
diff --git i/m4/ssize_t.m4 w/m4/ssize_t.m4
|
|
index 209d64c..5ea72a1 100644
|
|
--- i/m4/ssize_t.m4
|
|
+++ w/m4/ssize_t.m4
|
|
@@ -1,4 +1,4 @@
|
|
-# ssize_t.m4 serial 5 (gettext-0.18.2)
|
|
+# ssize_t.m4 serial 6 (gettext-0.18.2)
|
|
dnl Copyright (C) 2001-2003, 2006, 2010-2012 Free Software Foundation, Inc.
|
|
dnl This file is free software; the Free Software Foundation
|
|
dnl gives unlimited permission to copy and/or distribute it,
|
|
@@ -17,7 +17,21 @@ AC_DEFUN([gt_TYPE_SSIZE_T],
|
|
return !x;]])],
|
|
[gt_cv_ssize_t=yes], [gt_cv_ssize_t=no])])
|
|
if test $gt_cv_ssize_t = no; then
|
|
- AC_DEFINE([ssize_t], [int],
|
|
- [Define as a signed type of the same size as size_t.])
|
|
+ AC_CACHE_CHECK([for rank of size_t], [gt_cv_size_t_rank],
|
|
+ [AC_COMPILE_IFELSE(
|
|
+ [AC_LANG_PROGRAM(
|
|
+ [[#include <sys/types.h>
|
|
+ #ifdef __cplusplus
|
|
+ extern "C" {
|
|
+ #endif
|
|
+ int foo(unsigned long bar);
|
|
+ int foo(size_t bar);
|
|
+ #ifdef __cplusplus
|
|
+ }
|
|
+ #endif
|
|
+ ]])],
|
|
+ [gt_cv_size_t_rank=long], [gt_cv_size_t_rank=int])])
|
|
+ AC_DEFINE_UNQUOTED([ssize_t], [$gt_cv_size_t_rank],
|
|
+ [Define as a signed type of the same size and rank as size_t.])
|
|
fi
|
|
])
|