Procházet zdrojové kódy

Make new "mtdparts" code build with older compilers
Patch by Andrea Scian, 09 Aug 2005

Wolfgang Denk před 20 roky
rodič
revize
c4e0e68604
2 změnil soubory, kde provedl 8 přidání a 2 odebrání
  1. 3 0
      CHANGELOG
  2. 5 2
      common/cmd_jffs2.c

+ 3 - 0
CHANGELOG

@@ -2,6 +2,9 @@
 Changes for U-Boot 1.1.3:
 ======================================================================
 
+* Make new "mtdparts" code build with older compilers
+  Patch by Andrea Scian, 09 Aug 2005
+
 * Changed CONFIG_440_GX, CONFIG_440_EP and CONFIG_440_GR options to
   CONFIG_44GX, CONFIG_440EP and CONFIG_440GR for a consistent design
   with the 405 defines and the linux kernel defines.

+ 5 - 2
common/cmd_jffs2.c

@@ -1627,6 +1627,9 @@ int mtdparts_init(void)
 
 	DEBUGF("\n---mtdparts_init---\n");
 	if (!initialized) {
+		struct mtdids *id;
+		struct part_info *part;
+
 		initialized = 1;
 		current_dev = (struct mtd_device *)
 			malloc(sizeof(struct mtd_device) +
@@ -1639,8 +1642,8 @@ int mtdparts_init(void)
 		memset(current_dev, 0, sizeof(struct mtd_device) +
 					sizeof(struct part_info) + sizeof(struct mtdids));
 
-		struct mtdids *id = (struct mtdids *)(current_dev + 1);
-		struct part_info *part = (struct part_info *)(id + 1);
+		id = (struct mtdids *)(current_dev + 1);
+		part = (struct part_info *)(id + 1);
 
 		/* id */
 		id->mtd_id = "single part";