X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fphysmem.c;h=4b532e1a083db6236548a9093493049a3c80f27f;hb=1a2869593e115e4a6c74aaa0b23ca612357403ce;hp=4f192d11b2bbb0124370bda595d1fc8947780710;hpb=33ad5e9f9a412dffe953ed2dacff65700827710d;p=gnulib.git

diff --git a/lib/physmem.c b/lib/physmem.c
index 4f192d11b..4b532e1a0 100644
--- a/lib/physmem.c
+++ b/lib/physmem.c
@@ -1,10 +1,12 @@
 /* Calculate the size of physical memory.
-   Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 2000, 2001, 2003, 2005, 2006 Free Software
+   Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,20 +14,15 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "physmem.h"
 
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #if HAVE_SYS_PSTAT_H
 # include <sys/pstat.h>
@@ -82,7 +79,7 @@ typedef WINBOOL (WINAPI *PFN_MS_EX) (lMEMORYSTATUSEX*);
 
 /* Return the total amount of physical memory.  */
 double
-physmem_total ()
+physmem_total (void)
 {
 #if defined _SC_PHYS_PAGES && defined _SC_PAGESIZE
   { /* This works on linux-gnu, solaris2 and cygwin.  */
@@ -186,7 +183,7 @@ physmem_total ()
 
 /* Return the amount of physical memory available.  */
 double
-physmem_available ()
+physmem_available (void)
 {
 #if defined _SC_AVPHYS_PAGES && defined _SC_PAGESIZE
   { /* This works on linux-gnu, solaris2 and cygwin.  */
@@ -292,7 +289,7 @@ physmem_available ()
 # include <stdlib.h>
 
 int
-main ()
+main (void)
 {
   printf ("%12.f %12.f\n", physmem_total (), physmem_available ());
   exit (0);
@@ -302,6 +299,6 @@ main ()
 
 /*
 Local Variables:
-compile-command: "gcc -DDEBUG -DHAVE_CONFIG_H -I.. -g -O -Wall -W physmem.c"
+compile-command: "gcc -DDEBUG -g -O -Wall -W physmem.c"
 End:
 */