mac80211: fix rt2800pci, tx ack timeout is now hardcoded

[openwrt.git] / tools / mkimage / src / mkimage.c

diff --git a/tools/mkimage/src/mkimage.c b/tools/mkimage/src/mkimage.c
index 67123d9..7c0432b 100644 (file)
--- a/tools/mkimage/src/mkimage.c
+++ b/tools/mkimage/src/mkimage.c
@@ -19,6 +19,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
  */
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
  */

+#ifdef __APPLE__
+#define __FreeBSD__ 10
+#endif

 
 #include <errno.h>
 #include <fcntl.h>
 
 #include <errno.h>
 #include <fcntl.h>


@@ -35,8 +38,8 @@
 
 #if defined(__BEOS__) || defined(__NetBSD__) || defined(__APPLE__)
 #include <inttypes.h>
 
 #if defined(__BEOS__) || defined(__NetBSD__) || defined(__APPLE__)
 #include <inttypes.h>

+#include <sys/types.h>

 #endif
 #endif

-

 #ifdef __WIN32__
 typedef unsigned int __u32;
 
 #ifdef __WIN32__
 typedef unsigned int __u32;
 


@@ -139,6 +142,7 @@ table_entry_t comp_name[] = {
     {  IH_COMP_NONE,   "none",         "uncompressed",         },
     {  IH_COMP_BZIP2,  "bzip2",        "bzip2 compressed",     },
     {  IH_COMP_GZIP,   "gzip",         "gzip compressed",      },
     {  IH_COMP_NONE,   "none",         "uncompressed",         },
     {  IH_COMP_BZIP2,  "bzip2",        "bzip2 compressed",     },
     {  IH_COMP_GZIP,   "gzip",         "gzip compressed",      },

+    {  IH_COMP_LZMA,   "lzma",         "lzma compressed",      },

     {  -1,             "",             "",                     },
 };
 
     {  -1,             "",             "",                     },
 };