--- fsys_ntfs.c	2004-10-27 14:51:38.000000000 +0800
+++ grub-0.93/stage2/fsys_ntfs.c	2004-10-27 14:51:28.000000000 +0800
@@ -170,6 +170,21 @@
 static int read_attribute(MFTR *mftr, int offset, char *buf, int len, RUNL *from_rl);
 static int get_next_run(RUNL *runl);

+/* 2004-12-01 CyberLink Corp. <http://www.gocyberlink.com> */ 
+#ifdef STAGE1_5
+#define grub_strlen my_strlen
+static int
+my_strlen (const char *str)
+{
+  int len = 0;
+
+  while (*str++)
+    len++;
+
+  return len;
+}
+#endif
+
 static inline int
 nsubstring (char *s1, char *s2)
 {
--- fsys_reiserfs.c~	2004-10-27 15:12:30.000000000 +0800
+++ grub-0.93/stage2/fsys_reiserfs.c	2004-10-27 15:12:30.000000000 +0800
@@ -112,7 +112,8 @@
   /* offset in the log of where to start replay after a crash */
   __u32 j_first_unflushed_offset;
   /* mount id to detect very old transactions */
-  __u32 long j_mount_id;
+/* 2004-12-01 CyberLink Corp. <http://www.gocyberlink.com> */
+  __u32 j_mount_id;
 };
 
 /* magic string to find desc blocks in the journal */
