projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests for module 'unicase/u16-is-uppercase'.
[gnulib.git]
/
lib
/
physmem.c
diff --git
a/lib/physmem.c
b/lib/physmem.c
index
4f192d1
..
4b532e1
100644
(file)
--- a/
lib/physmem.c
+++ b/
lib/physmem.c
@@
-1,10
+1,12
@@
/* Calculate the size of physical memory.
/* 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
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
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
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. */
/* Written by Paul Eggert. */
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "physmem.h"
#include "physmem.h"
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
#if HAVE_SYS_PSTAT_H
# include <sys/pstat.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
/* 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. */
{
#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
/* 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. */
{
#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
# include <stdlib.h>
int
-main ()
+main (
void
)
{
printf ("%12.f %12.f\n", physmem_total (), physmem_available ());
exit (0);
{
printf ("%12.f %12.f\n", physmem_total (), physmem_available ());
exit (0);
@@
-302,6
+299,6
@@
main ()
/*
Local Variables:
/*
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:
*/
End:
*/