Fix some trivial things in the build system

2 files changed, 15 insertions, 5 deletions

diff --git a/autoar-extract.c b/autoar-extract.c
index 0a42d56..c30d70c 100644
--- a/autoar-extract.c
+++ b/autoar-extract.c
@@ -29,15 +29,25 @@
 
 #include <archive.h>
 #include <archive_entry.h>
-#include <fcntl.h>
 #include <gio/gio.h>
-#include <grp.h>
-#include <pwd.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
+#if defined HAVE_MKFIFO || defined HAVE_MKNOD
+# include <fcntl.h>
+#endif
+
+#ifdef HAVE_GETPWNAM
+# include <pwd.h>
+#endif
+
+#ifdef HAVE_GETGRNAM
+# include <grp.h>
+#endif
+
+
 G_DEFINE_TYPE (AutoarExtract, autoar_extract, G_TYPE_OBJECT)
 
 #define AUTOAR_EXTRACT_GET_PRIVATE(o) \
diff --git a/autoar-extract.h b/autoar-extract.h
index ed2a7fc..37c335e 100644
--- a/autoar-extract.h
+++ b/autoar-extract.h
@@ -31,7 +31,7 @@
 
 G_BEGIN_DECLS
 
-#define AUTOAR_TYPE_EXTRACT             autoar_extract_get_type()
+#define AUTOAR_TYPE_EXTRACT             autoar_extract_get_type ()
 #define AUTOAR_EXTRACT(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), AUTOAR_TYPE_EXTRACT, AutoarExtract))
 #define AUTOAR_EXTRACT_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), AUTOAR_TYPE_EXTRACT, AutoarExtractClass))
 #define AUTOAR_IS_EXTRACT(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AUTOAR_TYPE_EXTRACT))
@@ -91,4 +91,4 @@ void            autoar_extract_set_completed_files (AutoarExtract *arextract,
 
 G_END_DECLS
 
-#endif /* __AUTOARCHIVE_EXTRACT_H__ */
+#endif /* AUTOAR_EXTRACT_H */