Merge r21-4-11-chise-0_20-=ucs.

[chise/xemacs-chise.git.1] / netinstall / ini.h

diff --git a/netinstall/ini.h b/netinstall/ini.h
index 6e5eab2..00ab152 100644 (file)
--- 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++) \