X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fautodata%2Fautodata.h;h=1e513963f73f3209b2412782e38381fa5745ad59;hp=c9d774b982ee74256eb898917ed365ba1c7ac62d;hb=HEAD;hpb=3db2dce0d4b266b13a0e58fc8583e66177ed4555

diff --git a/ccan/autodata/autodata.h b/ccan/autodata/autodata.h
index c9d774b9..1e513963 100644
--- a/ccan/autodata/autodata.h
+++ b/ccan/autodata/autodata.h
@@ -12,7 +12,7 @@
  * @name: the name for this set of autodata
  * @type: the type this autodata points to
  *
- * This macro is usually placed in a header: it must preceed any
+ * This macro is usually placed in a header: it must precede any
  * autodata functions in the file.
  *
  * Example:
@@ -23,7 +23,7 @@
  */
 #define AUTODATA_TYPE(name, type)					\
 	typedef type autodata_##name##_;				\
-	extern type *__start_autodata_##name[], *__stop_autodata_##name[]
+	extern type *__start_xautodata_##name[], *__stop_xautodata_##name[]
 
 /**
  * AUTODATA - add a pointer to this autodata set
@@ -42,7 +42,7 @@
  */
 #define AUTODATA(name, ptr) \
 	static const autodata_##name##_ *NEEDED		\
-	__attribute__((section("autodata_" #name)))	\
+	__attribute__((section("xautodata_" #name)))	\
 	AUTODATA_VAR_(name, __LINE__) = (ptr);
 
 /**
@@ -59,7 +59,8 @@
  * Example:
  *	static void print_embedded_names(void)
  *	{
- *		unsigned int i, num;
+ *		unsigned int i;
+ *		size_t num;
  *		char **n = autodata_get(names, &num);
  *
  *		for (i = 0; i < num; i++)
@@ -68,8 +69,8 @@
  */
 #define autodata_get(name, nump)					\
 	((autodata_##name##_ **)					\
-	 autodata_get_section(__start_autodata_##name,			\
-			      __stop_autodata_##name, (nump)))
+	 autodata_get_section(__start_xautodata_##name,			\
+			      __stop_xautodata_##name, (nump)))
 #endif /* HAVE_SECTION_START_STOP */
 
 /**