add ifdefs to proto/ethernet.h so that it does't conflict with linux includes

[openwrt.git] / package / openwrt / jffs2root.c

diff --git a/package/openwrt/jffs2root.c b/package/openwrt/jffs2root.c
index 2ff37fd..e0cbfb9 100644 (file)
--- a/package/openwrt/jffs2root.c
+++ b/package/openwrt/jffs2root.c
@@ -3,8 +3,6 @@
  *
  * Copyright (C) 2005 Mike Baker 
  *
- * $Id$
- *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
@@ -19,6 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
+ * $Id$
+ *
  */
 
 #include <stdio.h>
@@ -84,11 +84,13 @@ int main(int argc, char **argv)
     if (argc > 1 && !strcmp(argv[1],"--move")) {
       if (ptr->offsets[1] >= ptr->len) {
         printf("Partition already moved outside trx\n");
+#if 0
       } else if (ptr->offsets[1] & 0x0001ffff) {
         printf("Partition does not start on a block boundary\n");
+#endif
       } else {
        init_crc32();
-       bzero((void *)((int)ptr + ptr->len), (size_t)(len - ptr->len));
+       //bzero((void *)((int)ptr + ptr->len), (size_t)(len - ptr->len));
         ptr->len = ptr->offsets[1];
         ptr->crc32 = crc32buf((void *) &(ptr->flag_version), ptr->len - offsetof(struct trx_header, flag_version));
        msync(ptr,len,MS_SYNC|MS_INVALIDATE);