sys/param.h for all arches, not just freebsd

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@454 7f574dfc-610e-0410-a909-a81674777703

diff --git a/src/conky.h b/src/conky.h
index a9d39fe..17f926f 100644 (file)
--- a/src/conky.h
+++ b/src/conky.h
@@ -19,8 +19,8 @@
 #include <locale.h>
 #include <langinfo.h>
 #include <wchar.h>
-#if defined(__FreeBSD__)
 #include <sys/param.h>
+#if defined(__FreeBSD__)
 #include <sys/mount.h>
 #include <sys/ucred.h>
 #endif /* __FreeBSD__ */
@@ -56,12 +56,14 @@ fprintf(stderr, "Conky: " s "\n", ##varargs)
 #define CRIT_ERR(s, varargs...) \
 { fprintf(stderr, "Conky: " s "\n", ##varargs);  exit(EXIT_FAILURE); }
 
+/* in sys/param.h
 #ifndef MIN
 #define MIN(a,b) (a>b ? b : a)
 #endif
 #ifndef MAX
 #define MAX(a,b) (a<b ? b : a)
 #endif
+*/
 
 struct i8k_struct {
        char *version;