X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=netinstall%2Fini.h;h=00ab152e546cf874bbcb18ad4ba1c645bd0ea44d;hb=f7019bf646d0d4e750e0186d6e912ec7a3b9da90;hp=6e5eab221d3a9e66e177aa70c556c828c4dc07da;hpb=1ecbe603154527afa87c21523aedd8e3bda77c2f;p=chise%2Fxemacs-chise.git.1

diff --git a/netinstall/ini.h b/netinstall/ini.h
index 6e5eab2..00ab152 100644
--- a/netinstall/ini.h
+++ b/netinstall/ini.h
@@ -61,19 +61,20 @@ typedef struct {
   } info[NTRUST+1];	/* +1 for TRUST_UNKNOWN */
 } Package;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern Package *package;
 extern Package *xemacs_package;
 
 extern int npackages;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 Package *new_package (char *name);
 void	ini_init (char *string);
 
-#define pi (package[i].info[package[i].trust])
+#define pinfo(p) ((p).info[(p).trust])
+#define pi pinfo(package[i])
 
 #define LOOP_PACKAGES \
   for (i=0; i<npackages; i++) \