stop installing duplicate docs; tweak installed files; Add info manual to doc-base

[gnulib.git] / lib / get-rusage-data.c

diff --git a/lib/get-rusage-data.c b/lib/get-rusage-data.c
index b0ac7f1..2ee911c 100644 (file)
--- a/lib/get-rusage-data.c
+++ b/lib/get-rusage-data.c
@@ -1,5 +1,5 @@
 /* Getter for RLIMIT_DATA.
 /* Getter for RLIMIT_DATA.

-   Copyright (C) 2011-2012 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.

    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify


@@ -50,7 +50,7 @@
      Note that malloc() falls back on mmap() for large allocations and also
      for small allocations if there is not enough room in the data segment.
 
      Note that malloc() falls back on mmap() for large allocations and also
      for small allocations if there is not enough room in the data segment.
 

-   MacOS X:
+   Mac OS X:

      a) setrlimit with RLIMIT_DATA succeeds but does not really work: The OS
         ignores RLIMIT_DATA. Therefore get_rusage_data_via_setrlimit() is
         always 0.
      a) setrlimit with RLIMIT_DATA succeeds but does not really work: The OS
         ignores RLIMIT_DATA. Therefore get_rusage_data_via_setrlimit() is
         always 0.


@@ -150,7 +150,7 @@
 #  define errno_expected() (errno == EINVAL)
 # endif
 
 #  define errno_expected() (errno == EINVAL)
 # endif
 

-static inline uintptr_t
+static uintptr_t

 get_rusage_data_via_setrlimit (void)
 {
   uintptr_t result;
 get_rusage_data_via_setrlimit (void)
 {
   uintptr_t result;


@@ -306,7 +306,7 @@ get_rusage_data_via_setrlimit (void)
 
 #else
 
 
 #else
 

-static inline uintptr_t
+static uintptr_t

 get_rusage_data_via_setrlimit (void)
 {
   return 0;
 get_rusage_data_via_setrlimit (void)
 {
   return 0;


@@ -337,7 +337,7 @@ vma_iterate_callback (void *data, uintptr_t start, uintptr_t end,
   return 0;
 }
 
   return 0;
 }
 

-static inline uintptr_t
+static uintptr_t

 get_rusage_data_via_iterator (void)
 {
 # if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __BEOS__ || defined __HAIKU__
 get_rusage_data_via_iterator (void)
 {
 # if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __BEOS__ || defined __HAIKU__


@@ -372,7 +372,7 @@ get_rusage_data_via_iterator (void)
 
 #else
 
 
 #else
 

-static inline uintptr_t
+static uintptr_t

 get_rusage_data_via_iterator (void)
 {
   return 0;
 get_rusage_data_via_iterator (void)
 {
   return 0;


@@ -384,7 +384,7 @@ get_rusage_data_via_iterator (void)
 uintptr_t
 get_rusage_data (void)
 {
 uintptr_t
 get_rusage_data (void)
 {

-#if (defined __APPLE__ && defined __MACH__) || defined __CYGWIN__ /* MacOS X, Cygwin */
+#if (defined __APPLE__ && defined __MACH__) || defined __CYGWIN__ /* Mac OS X, Cygwin */

   /* get_rusage_data_via_setrlimit() does not work.
      Prefer get_rusage_data_via_iterator().  */
   return get_rusage_data_via_iterator ();
   /* get_rusage_data_via_setrlimit() does not work.
      Prefer get_rusage_data_via_iterator().  */
   return get_rusage_data_via_iterator ();