diff -r cd3954499086 -r 95b6bcadd6c4 librazor/razor.h
--- a/librazor/razor.h	Mon Jun 30 13:28:59 2008 -0400
+++ b/librazor/razor.h	Tue Jul 01 09:22:25 2008 +0100
@@ -22,13 +22,6 @@
 
 #include <stdint.h>
 
-/* GCC sentinel */
-#if defined(__GNUC__) && __GNUC__ >= 4
-#define RAZOR_SENTINEL __attribute__ ((__sentinel__(0)));
-#else
-#define RAZOR_SENTINEL
-#endif
-
 enum razor_repo_file_type {
 	RAZOR_REPO_FILE_MAIN,
 	RAZOR_REPO_FILE_DETAILS,
@@ -36,7 +29,8 @@
 };
 
 enum razor_detail_type {
-	RAZOR_DETAIL_NAME = 1, /* NULL (0 on 32 bit) is the sentinel */
+	RAZOR_DETAIL_LAST = 0,	/* the sentinel */
+	RAZOR_DETAIL_NAME,
 	RAZOR_DETAIL_VERSION,
 	RAZOR_DETAIL_ARCH,
 	RAZOR_DETAIL_SUMMARY,
@@ -102,8 +96,7 @@
 
 void
 razor_package_get_details(struct razor_set *set,
-			  struct razor_package *package, ...)
-			  RAZOR_SENTINEL;
+			  struct razor_package *package, ...);
 
 
 /**
@@ -153,8 +146,7 @@
 				       const char *filename);
 
 int razor_package_iterator_next(struct razor_package_iterator *pi,
-				struct razor_package **package, ...)
-				RAZOR_SENTINEL;
+				struct razor_package **package, ...);
 void razor_package_iterator_destroy(struct razor_package_iterator *pi);
 
 struct razor_package_query *