Implement sendfirm functionality in beastpatcher. Set svn:eol-style properties.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21260 a1c6a512-1295-4272-9138-f99709370657

10 files changed, 1241 insertions, 1039 deletions

diff --git a/utils/MTP/beastpatcher/Makefile b/utils/MTP/beastpatcher/Makefile
index 9c3ed571ee..5f3951d8be 100644
--- a/utils/MTP/beastpatcher/Makefile
+++ b/utils/MTP/beastpatcher/Makefile
@@ -30,22 +30,22 @@ CC = $(CROSS)gcc
 
 all: $(OUTPUT)
 
-beastpatcher: beastpatcher.c bootimg.c mtp_common.h mtp_libmtp.c
-	gcc $(CFLAGS) -o beastpatcher beastpatcher.c bootimg.c mtp_libmtp.c $(LIBS)
+beastpatcher: beastpatcher.c bootimg.c mtp_common.h mtp_libmtp.c main.c
+	gcc $(CFLAGS) -o beastpatcher beastpatcher.c bootimg.c mtp_libmtp.c main.c $(LIBS)
 	strip beastpatcher
 
-beastpatcher.exe:  beastpatcher.c bootimg.c mtp_common.h mtp_win32.c $(WINLIBS)
-	$(CC) $(CFLAGS) -o beastpatcher.exe beastpatcher.c bootimg.c mtp_win32.c $(WINLIBS)
+beastpatcher.exe:  beastpatcher.c bootimg.c mtp_common.h mtp_win32.c main.c $(WINLIBS)
+	$(CC) $(CFLAGS) -o beastpatcher.exe beastpatcher.c bootimg.c mtp_win32.c main.c $(WINLIBS)
 	$(CROSS)strip beastpatcher.exe
 
 beastpatcher-mac: beastpatcher-i386 beastpatcher-ppc
 	lipo -create beastpatcher-ppc beastpatcher-i386 -output beastpatcher-mac
 
-beastpatcher-i386:  beastpatcher.c  bootimg.c usb.h libusb-i386.a
+beastpatcher-i386:  beastpatcher.c  bootimg.c usb.h main.c libusb-i386.a
 	$(CC) -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -framework iokit -framework coreservices -arch i386 $(CFLAGS) -o beastpatcher-i386 beastpatcher.c bootimg.c -I. libusb-i386.a
 	strip beastpatcher-i386
 
-beastpatcher-ppc: beastpatcher.c bootimg.c usb.h libusb-ppc.a
+beastpatcher-ppc: beastpatcher.c bootimg.c usb.h main.c libusb-ppc.a
 	$(CC) -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -framework iokit -framework coreservices -arch ppc $(CFLAGS) -o beastpatcher-ppc beastpatcher.c bootimg.c -I. libusb-ppc.a
 	strip beastpatcher-ppc
 
diff --git a/utils/MTP/beastpatcher/README.pstdint b/utils/MTP/beastpatcher/README.pstdint
index 8dacc44fe2..259760f81d 100644
--- a/utils/MTP/beastpatcher/README.pstdint
+++ b/utils/MTP/beastpatcher/README.pstdint
@@ -1,7 +1,7 @@
-pstdint.h: A portable stdint.h

-

-This file is taken from http://www.azillionmonkeys.com/qed/pstdint.h

-

-Copyright (c) 2005-2007 Paul Hsieh

-Licensed under the BSD License. See file header for details.

-

+pstdint.h: A portable stdint.h
+
+This file is taken from http://www.azillionmonkeys.com/qed/pstdint.h
+
+Copyright (c) 2005-2007 Paul Hsieh
+Licensed under the BSD License. See file header for details.
+
diff --git a/utils/MTP/beastpatcher/beastpatcher.c b/utils/MTP/beastpatcher/beastpatcher.c
index 783b11f202..f0d9394f11 100644
--- a/utils/MTP/beastpatcher/beastpatcher.c
+++ b/utils/MTP/beastpatcher/beastpatcher.c
@@ -55,18 +55,6 @@
 #include "mtp_common.h"
 #include "bootimg.h"
 
-#define VERSION "1.0 with v1 bootloader"
-
-void print_usage(void)
-{
-    fprintf(stderr,"Usage: beastpatcher [action]\n");
-    fprintf(stderr,"\n");
-    fprintf(stderr,"Where [action] is one of the following options:\n");
-    fprintf(stderr,"        --install (default)\n");
-    fprintf(stderr,"  -?,   --help\n");
-    fprintf(stderr,"\n");
-}
-
 /* Code to create a single-boot bootloader.
    Based on tools/gigabeats.c by Will Robertson.  
 */
@@ -139,27 +127,13 @@ static void create_single_boot(unsigned char* boot, int bootlen,
     return;
 }
 
-int beastpatcher(int argc, char* argv[])
+int beastpatcher(void)
 {
     char yesno[4];
     unsigned char* fwbuf;
     int fwsize;
     struct mtp_info_t mtp_info;
 
-    (void)argv;
-
-    fprintf(stderr,"beastpatcher v" VERSION " - (C) 2009 by the Rockbox developers\n");
-    fprintf(stderr,"This is free software; see the source for copying conditions.  There is NO\n");
-    fprintf(stderr,"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n");
-
-    /* No options are currently implemented, so just display help if any are 
-       provided. */
-
-    if (argc > 1) {
-        print_usage();
-        return 1;
-    }
-
     if (mtp_init(&mtp_info) < 0) {
         fprintf(stderr,"[ERR]  Can not init MTP\n");
         return 1;
@@ -212,16 +186,3 @@ int beastpatcher(int argc, char* argv[])
     return 0;
 }
 
-
-int main(int argc, char* argv[])
-{
-    int res;
-    char yesno[4];
-
-    res = beastpatcher(argc, argv);
-
-    printf("\nPress ENTER to exit beastpatcher: ");
-    fgets(yesno,4,stdin);
-
-    return res;
-}
diff --git a/utils/MTP/beastpatcher/beastpatcher.h b/utils/MTP/beastpatcher/beastpatcher.h
new file mode 100644
index 0000000000..c73ae910be
--- /dev/null
+++ b/utils/MTP/beastpatcher/beastpatcher.h
@@ -0,0 +1,45 @@
+/*
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ *
+ * $Id$
+ *
+ * Copyright (c) 2009, Dave Chapman
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ * 
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials provided
+ *       with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#ifndef BEASTPATCHER_H
+#define BEASTPATCHER_H
+
+int beastpatcher(void);
+
+#endif
diff --git a/utils/MTP/beastpatcher/main.c b/utils/MTP/beastpatcher/main.c
new file mode 100644
index 0000000000..56d1a1e94c
--- /dev/null
+++ b/utils/MTP/beastpatcher/main.c
@@ -0,0 +1,93 @@
+/*
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ *
+ * $Id$
+ *
+ * Copyright (c) 2009, Dave Chapman
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ * 
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials provided
+ *       with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#include <stdio.h>
+#include "beastpatcher.h"
+#include "mtp_common.h"
+
+#if defined(__WIN32__) || defined(_WIN32)
+#include <windows.h>
+#endif
+
+#define VERSION "1.0 with v1 bootloader"
+
+#include "../MTP_DLL/MTP_DLL.h"
+
+static void print_usage(void)
+{
+    fprintf(stderr,"Usage: beastpatcher [action]\n");
+    fprintf(stderr,"\n");
+    fprintf(stderr,"Where [action] is one of the following options:\n");
+    fprintf(stderr,"  -i,   --install (default)\n");
+    fprintf(stderr,"  -h,   --help\n");
+	fprintf(stderr,"  -s,   --send              nk.bin\n");
+    fprintf(stderr,"\n");
+}
+
+
+int main(int argc, char* argv[])
+{
+    int res;
+    char yesno[4];
+	struct mtp_info_t mtp_info;
+
+	fprintf(stderr,"beastpatcher v" VERSION " - (C) 2009 by the Rockbox developers\n");
+    fprintf(stderr,"This is free software; see the source for copying conditions.  There is NO\n");
+    fprintf(stderr,"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n");
+
+	if(argc == 1 || strcmp(argv[1],"-i")==0 || strcmp(argv[1],"--install")==0) {
+		res = beastpatcher();
+		/* don't ask for enter if started with command line arguments */
+		if(argc == 1) {
+			printf("\nPress ENTER to exit beastpatcher: ");
+			fgets(yesno,4,stdin);
+		}
+	}
+	else if((argc > 2) && ((strcmp(argv[1],"-s")==0) || (strcmp(argv[1],"--send")==0))) {
+        res = mtp_send_file(&mtp_info, argv[2]);
+	}
+	else {
+	    print_usage();
+        res = -1;
+	}
+
+    return res;
+}
+
+
diff --git a/utils/MTP/beastpatcher/mtp_common.h b/utils/MTP/beastpatcher/mtp_common.h
index 4b60fa08da..2ca87c7509 100644
--- a/utils/MTP/beastpatcher/mtp_common.h
+++ b/utils/MTP/beastpatcher/mtp_common.h
@@ -66,5 +66,6 @@ int mtp_finished(struct mtp_info_t* mtp_info);
 int mtp_scan(struct mtp_info_t* mtp_info);
 int mtp_send_firmware(struct mtp_info_t* mtp_info, unsigned char* fwbuf,
                       int fwsize);
+int mtp_send_file(struct mtp_info_t* mtp_info, const char* filename);
 
 #endif /* !_MTP_COMMON_H */
diff --git a/utils/MTP/beastpatcher/mtp_libmtp.c b/utils/MTP/beastpatcher/mtp_libmtp.c
index c29e5277b2..90477fb0e7 100644
--- a/utils/MTP/beastpatcher/mtp_libmtp.c
+++ b/utils/MTP/beastpatcher/mtp_libmtp.c
@@ -47,6 +47,8 @@
 #include "libmtp.h"
 #include "mtp_common.h"
 
+static int mtp_send_fileptr(struct mtp_info_t* mtp_info, FILE* fwfile, size_t fwsize);
+
 int mtp_init(struct mtp_info_t* mtp_info)
 {
     /* Fill the info struct with zeros - mainly for the strings */
@@ -74,8 +76,8 @@ int mtp_scan(struct mtp_info_t* mtp_info)
     if (mtp_info->device == NULL)
     {
         return -1;
-    } 
-    else 
+    }
+    else
     {
         /* NOTE: These strings are filled with zeros in mtp_init() */
 #ifndef REALLYOLDMTP
@@ -117,7 +119,6 @@ static int progress(uint64_t const sent, uint64_t const total,
 int mtp_send_firmware(struct mtp_info_t* mtp_info, unsigned char* fwbuf,
                       int fwsize)
 {
-    LIBMTP_file_t *genfile;
     int ret;
     size_t n;
     FILE* fwfile;
@@ -142,6 +143,20 @@ int mtp_send_firmware(struct mtp_info_t* mtp_info, unsigned char* fwbuf,
     /* Reset file pointer */
     fseek(fwfile, SEEK_SET, 0);
 
+    ret = mtp_send_fileptr(mtp_info, fwfile, fwsize);
+
+    /* Close the temporary file - this also deletes it. */
+    fclose(fwfile);
+
+    return 0;
+}
+
+
+static int mtp_send_fileptr(struct mtp_info_t* mtp_info, FILE* fwfile, size_t fwsize)
+{
+    LIBMTP_file_t* genfile;
+    int ret;
+
     /* Prepare for uploading firmware */
     genfile = LIBMTP_new_file_t();
     genfile->filetype = LIBMTP_FILETYPE_FIRMWARE;
@@ -149,10 +164,10 @@ int mtp_send_firmware(struct mtp_info_t* mtp_info, unsigned char* fwbuf,
     genfile->filesize = fwsize;
 
 #ifdef OLDMTP
-    ret = LIBMTP_Send_File_From_File_Descriptor(mtp_info->device, 
+    ret = LIBMTP_Send_File_From_File_Descriptor(mtp_info->device,
             fileno(fwfile), genfile, progress, NULL, 0);
 #else
-    ret = LIBMTP_Send_File_From_File_Descriptor(mtp_info->device, 
+    ret = LIBMTP_Send_File_From_File_Descriptor(mtp_info->device,
             fileno(fwfile), genfile, progress, NULL);
 #endif
 
@@ -167,8 +182,35 @@ int mtp_send_firmware(struct mtp_info_t* mtp_info, unsigned char* fwbuf,
     /* Cleanup */
     LIBMTP_destroy_file_t(genfile);
 
-    /* Close the temporary file - this also deletes it. */
-    fclose(fwfile);
+    return ret;
+}
 
-    return 0;
+
+int mtp_send_file(struct mtp_info_t* mtp_info, const char* filename)
+{
+    FILE* fwfile;
+    int ret;
+#ifdef _LARGEFILE64_SOURCE
+    struct stat64 sb;
+    ret = stat64(filename, &sb);
+#else
+    struct stat sb;
+    ret = stat(filename, &sb);
+#endif
+    if (ret == -1)
+    {
+        perror("[ERR]  ");
+    }
+
+    fwfile = fopen(filename, "r");
+    if (fwfile == NULL)
+    {
+        fprintf(stderr,"[ERR]  Could not create temporary file.\n");
+        return -1;
+    }
+    ret = mtp_send_fileptr(mtp_info, fwfile, sb.st_size);
+
+    fclose(fwfile);
+    return ret;
 }
+
diff --git a/utils/MTP/beastpatcher/mtp_win32.c b/utils/MTP/beastpatcher/mtp_win32.c
index ced930ab80..1d6105f4fa 100644
--- a/utils/MTP/beastpatcher/mtp_win32.c
+++ b/utils/MTP/beastpatcher/mtp_win32.c
@@ -1,179 +1,231 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * 
- * $Id$
- *
- * Copyright (c) 2009, Dave Chapman
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- * 
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials provided
- *       with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- ****************************************************************************/
-
-#include <stdio.h>
-#include <string.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <windows.h>
-#include <tchar.h>
-
-#include "mtp_common.h"
-
-#include "../MTP_DLL/MTP_DLL.h"
-
-int mtp_init(struct mtp_info_t* mtp_info)
-{
-   /* Fill the info struct with zeros - mainly for the strings */
-    memset(mtp_info, 0, sizeof(struct mtp_info_t));
-
-    return 0;
-
-}
-
-int mtp_finished(struct mtp_info_t* mtp_info)
-{
-    (void)mtp_info;
-
-    return 0;
-}
-
-int mtp_scan(struct mtp_info_t* mtp_info)
-{
-    wchar_t name[256];
-    wchar_t manufacturer[256];
-    DWORD version;
-    int num = 0;
-
-    num = mtp_description(name, manufacturer, &version);
-
-    wcstombs(mtp_info->manufacturer, manufacturer, 200);
-    wcstombs(mtp_info->modelname, name, 200);
-
-    sprintf(mtp_info->version, "%x", (unsigned int)version);
-    return (num > 0) ? num : -1;
-
-}
-
-static void callback(unsigned int progress, unsigned int max)
-{
-    int percent = (progress * 100) / max;
-
-    printf("Progress: %u of %u (%d%%)\r", progress, max, percent);
-    fflush(stdout);
-}
-
-
-int mtp_send_firmware(struct mtp_info_t* mtp_info, unsigned char* fwbuf,
-                      int fwsize)
-{
-    HANDLE hTempFile; 
-    DWORD dwRetVal;
-    DWORD dwBytesWritten; 
-    UINT uRetVal;
-    TCHAR szTempName[1024];
-    TCHAR lpPathBuffer[1024];
-    BOOL fSuccess;
-    wchar_t *tmp;
-    int ret;
-    
-    (void)mtp_info;
-
-    /* Get the path for temporary files */    
-    dwRetVal = GetTempPath(sizeof(lpPathBuffer), lpPathBuffer);
-    if (dwRetVal > sizeof(lpPathBuffer) || (dwRetVal == 0))
-    {
-        fprintf(stderr, "[ERR]  GetTempPath failed (%d)\n", (int)GetLastError());
-        return -1;
-    }
-
-    /* Create the temporary file */
-    uRetVal = GetTempFileName(lpPathBuffer, TEXT("NKBIN"), 0, szTempName);  
-    if (uRetVal == 0)
-    {
-        fprintf(stderr, "[ERR]  GetTempFileName failed (%d)\n", (int)GetLastError());
-        return -1;
-    }
-
-    /* Now create the file */
-    hTempFile = CreateFile((LPTSTR) szTempName, // file name 
-                           GENERIC_READ | GENERIC_WRITE, // open r-w 
-                           0,                    // do not share 
-                           NULL,                 // default security 
-                           CREATE_ALWAYS,        // overwrite existing
-                           FILE_ATTRIBUTE_NORMAL,// normal file 
-                           NULL);                // no template 
-    if (hTempFile == INVALID_HANDLE_VALUE) 
-    { 
-        fprintf(stderr, "[ERR]  Could not create %s\n", szTempName);
-        return -1;
-    } 
-
-    fSuccess = WriteFile(hTempFile, fwbuf, fwsize, &dwBytesWritten, NULL); 
-    if (!fSuccess) 
-    {
-        fprintf(stderr, "[ERR]  WriteFile failed (%d)\n", (int)GetLastError());
-        return -1;
-    }
-
-    fSuccess = CloseHandle (hTempFile);
-    if (!fSuccess) 
-    {
-       fprintf(stderr, "[ERR]  CloseHandle failed (%d)\n", (int)GetLastError());
-       return -1;
-    }
-
-    tmp = (LPWSTR)malloc(_tcslen(szTempName)*2+1);
-    mbstowcs(tmp, (char*)szTempName, _tcslen(szTempName)*2+1);
-    
-    fprintf(stderr, "[INFO]  Sending firmware...\n");
-    if (mtp_sendnk(tmp, fwsize, &callback))
-    {
-        fprintf(stderr, "[INFO] Firmware sent successfully\n");
-        ret = 0;
-    }
-    else
-    {
-        fprintf(stderr, "[ERR]  Error occured during sending.\n");
-        ret = -1;
-    }
-        
-    /* Keep the progress line onscreen */
-    printf("\n");
-
-    free(tmp);
-
-    if (!DeleteFile(szTempName))
-        fprintf(stderr,"[WARN] Could not remove temporary file %s\n",szTempName);
-
-    return ret;
-}
-
+/***************************************************************************

+ *             __________               __   ___.

+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___

+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /

+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <

+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \

+ *                     \/            \/     \/    \/            \/

+ * 

+ * $Id$

+ *

+ * Copyright (c) 2009, Dave Chapman

+ * All rights reserved.

+ * 

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are

+ * met:

+ * 

+ *     * Redistributions of source code must retain the above copyright

+ *       notice, this list of conditions and the following disclaimer.

+ * 

+ *     * Redistributions in binary form must reproduce the above

+ *       copyright notice, this list of conditions and the following

+ *       disclaimer in the documentation and/or other materials provided

+ *       with the distribution.

+ * 

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ *

+ *

+ ****************************************************************************/

+

+#include <stdio.h>

+#include <string.h>

+#include <stddef.h>

+#include <stdlib.h>

+#include <wchar.h>

+#include <windows.h>

+#include <sys/types.h>

+#include <sys/stat.h>

+#include <tchar.h>

+

+#include "mtp_common.h"

+

+#include "../MTP_DLL/MTP_DLL.h"

+

+

+static int filesize(const char* filename);

+

+

+int mtp_init(struct mtp_info_t* mtp_info)

+{

+   /* Fill the info struct with zeros - mainly for the strings */

+    memset(mtp_info, 0, sizeof(struct mtp_info_t));

+

+    return 0;

+

+}

+

+int mtp_finished(struct mtp_info_t* mtp_info)

+{

+    (void)mtp_info;

+

+    return 0;

+}

+

+int mtp_scan(struct mtp_info_t* mtp_info)

+{

+    wchar_t name[256];

+    wchar_t manufacturer[256];

+    DWORD version;

+    int num = 0;

+

+    num = mtp_description(name, manufacturer, &version);

+

+    wcstombs(mtp_info->manufacturer, manufacturer, 200);

+    wcstombs(mtp_info->modelname, name, 200);

+

+    sprintf(mtp_info->version, "%x", (unsigned int)version);

+    return (num > 0) ? num : -1;

+

+}

+

+static void callback(unsigned int progress, unsigned int max)

+{

+    int percent = (progress * 100) / max;

+

+	printf("[INFO] Progress: %u of %u (%d%%)\r", progress, max, percent);

+    fflush(stdout);

+}

+

+

+int mtp_send_firmware(struct mtp_info_t* mtp_info, unsigned char* fwbuf,

+                      int fwsize)

+{

+    HANDLE hTempFile; 

+    DWORD dwRetVal;

+    DWORD dwBytesWritten; 

+    UINT uRetVal;

+    TCHAR szTempName[1024];

+    TCHAR lpPathBuffer[1024];

+    BOOL fSuccess;

+    wchar_t *tmp;

+    int ret;

+    

+    (void)mtp_info;

+

+    /* Get the path for temporary files */    

+    dwRetVal = GetTempPath(sizeof(lpPathBuffer), lpPathBuffer);

+    if (dwRetVal > sizeof(lpPathBuffer) || (dwRetVal == 0))

+    {

+        fprintf(stderr, "[ERR]  GetTempPath failed (%d)\n", (int)GetLastError());

+        return -1;

+    }

+

+    /* Create the temporary file */

+    uRetVal = GetTempFileName(lpPathBuffer, TEXT("NKBIN"), 0, szTempName);  

+    if (uRetVal == 0)

+    {

+        fprintf(stderr, "[ERR]  GetTempFileName failed (%d)\n", (int)GetLastError());

+        return -1;

+    }

+

+    /* Now create the file */

+    hTempFile = CreateFile((LPTSTR) szTempName, // file name 

+                           GENERIC_READ | GENERIC_WRITE, // open r-w 

+                           0,                    // do not share 

+                           NULL,                 // default security 

+                           CREATE_ALWAYS,        // overwrite existing

+                           FILE_ATTRIBUTE_NORMAL,// normal file 

+                           NULL);                // no template 

+    if (hTempFile == INVALID_HANDLE_VALUE) 

+    { 

+        fprintf(stderr, "[ERR]  Could not create %s\n", szTempName);

+        return -1;

+    } 

+

+    fSuccess = WriteFile(hTempFile, fwbuf, fwsize, &dwBytesWritten, NULL); 

+    if (!fSuccess) 

+    {

+        fprintf(stderr, "[ERR]  WriteFile failed (%d)\n", (int)GetLastError());

+        return -1;

+    }

+

+    fSuccess = CloseHandle (hTempFile);

+    if (!fSuccess) 

+    {

+       fprintf(stderr, "[ERR]  CloseHandle failed (%d)\n", (int)GetLastError());

+       return -1;

+    }

+

+    tmp = (LPWSTR)malloc(_tcslen(szTempName)*2+1);

+    mbstowcs(tmp, (char*)szTempName, _tcslen(szTempName)*2+1);

+    

+    fprintf(stderr, "[INFO] Sending firmware...\n");

+    if (mtp_sendnk(tmp, fwsize, &callback))

+    {

+		fprintf(stderr, "\n");

+        fprintf(stderr, "[INFO] Firmware sent successfully\n");

+        ret = 0;

+    }

+    else

+    {

+		fprintf(stderr, "\n");

+        fprintf(stderr, "[ERR]  Error occured during sending.\n");

+        ret = -1;

+    }

+    free(tmp);

+

+    if (!DeleteFile(szTempName))

+        fprintf(stderr,"[WARN] Could not remove temporary file %s\n",szTempName);

+

+    return ret;

+}

+

+

+int mtp_send_file(struct mtp_info_t* mtp_info, const char* filename)

+{

+	wchar_t *fn;

+

+	fn = (LPWSTR)malloc(strlen(filename)*2+1);

+	mbstowcs(fn, filename, strlen(filename)*2+1);

+

+    if (mtp_init(mtp_info) < 0) {

+        fprintf(stderr,"[ERR]  Can not init MTP\n");

+        return 1;

+    }

+    /* Scan for attached MTP devices. */

+    if (mtp_scan(mtp_info) < 0)

+    {

+        fprintf(stderr,"[ERR]  No devices found\n");

+        return 1;

+    }

+

+	fprintf(stderr, "[INFO] Sending firmware...\n");

+	if (mtp_sendnk(fn, filesize(filename), &callback))

+	{

+		/* keep progress on screen */

+		printf("\n");

+		fprintf(stderr, "[INFO] Firmware sent successfully\n");

+		return 0;

+	}

+	else

+	{

+		fprintf(stderr, "[ERR]  Error occured during sending.\n");

+		return -1;

+	}

+	mtp_finished(mtp_info);

+}

+

+

+static int filesize(const char* filename)

+{

+	struct _stat sb;

+	int res;

+

+	res = _stat(filename, &sb);

+	if(res == -1) {

+		fprintf(stderr, "Error getting filesize!\n");

+		return -1;

+	}

+	return sb.st_size;

+}

diff --git a/utils/MTP/beastpatcher/pstdint.h b/utils/MTP/beastpatcher/pstdint.h
index 12c108a2e9..6a334bae98 100644
--- a/utils/MTP/beastpatcher/pstdint.h
+++ b/utils/MTP/beastpatcher/pstdint.h
@@ -1,799 +1,799 @@
-/*  A portable stdint.h

- ****************************************************************************

- *  BSD License:

- ****************************************************************************

- *

- *  Copyright (c) 2005-2007 Paul Hsieh

- *  All rights reserved.

- *  

- *  Redistribution and use in source and binary forms, with or without

- *  modification, are permitted provided that the following conditions

- *  are met:

- *  

- *  1. Redistributions of source code must retain the above copyright

- *     notice, this list of conditions and the following disclaimer.

- *  2. Redistributions in binary form must reproduce the above copyright

- *     notice, this list of conditions and the following disclaimer in the

- *     documentation and/or other materials provided with the distribution.

- *  3. The name of the author may not be used to endorse or promote products

- *     derived from this software without specific prior written permission.

- *  

- *  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

- *  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

- *  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.

- *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,

- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

- *  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

- *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

- *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF

- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- *

- ****************************************************************************

- *

- *  Version 0.1.11

- *

- *  The ANSI C standard committee, for the C99 standard, specified the

- *  inclusion of a new standard include file called stdint.h.  This is

- *  a very useful and long desired include file which contains several

- *  very precise definitions for integer scalar types that is

- *  critically important for making portable several classes of

- *  applications including cryptography, hashing, variable length

- *  integer libraries and so on.  But for most developers its likely

- *  useful just for programming sanity.

- *

- *  The problem is that most compiler vendors have decided not to

- *  implement the C99 standard, and the next C++ language standard

- *  (which has a lot more mindshare these days) will be a long time in

- *  coming and its unknown whether or not it will include stdint.h or

- *  how much adoption it will have.  Either way, it will be a long time

- *  before all compilers come with a stdint.h and it also does nothing

- *  for the extremely large number of compilers available today which

- *  do not include this file, or anything comparable to it.

- *

- *  So that's what this file is all about.  Its an attempt to build a

- *  single universal include file that works on as many platforms as

- *  possible to deliver what stdint.h is supposed to.  A few things

- *  that should be noted about this file:

- *

- *    1) It is not guaranteed to be portable and/or present an identical

- *       interface on all platforms.  The extreme variability of the

- *       ANSI C standard makes this an impossibility right from the

- *       very get go. Its really only meant to be useful for the vast

- *       majority of platforms that possess the capability of

- *       implementing usefully and precisely defined, standard sized

- *       integer scalars.  Systems which are not intrinsically 2s

- *       complement may produce invalid constants.

- *

- *    2) There is an unavoidable use of non-reserved symbols.

- *

- *    3) Other standard include files are invoked.

- *

- *    4) This file may come in conflict with future platforms that do

- *       include stdint.h.  The hope is that one or the other can be

- *       used with no real difference.

- *

- *    5) In the current verison, if your platform can't represent

- *       int32_t, int16_t and int8_t, it just dumps out with a compiler

- *       error.

- *

- *    6) 64 bit integers may or may not be defined.  Test for their

- *       presence with the test: #ifdef INT64_MAX or #ifdef UINT64_MAX.

- *       Note that this is different from the C99 specification which

- *       requires the existence of 64 bit support in the compiler.  If

- *       this is not defined for your platform, yet it is capable of

- *       dealing with 64 bits then it is because this file has not yet

- *       been extended to cover all of your system's capabilities.

- *

- *    7) (u)intptr_t may or may not be defined.  Test for its presence

- *       with the test: #ifdef PTRDIFF_MAX.  If this is not defined

- *       for your platform, then it is because this file has not yet

- *       been extended to cover all of your system's capabilities, not

- *       because its optional.

- *

- *    8) The following might not been defined even if your platform is

- *       capable of defining it:

- *

- *       WCHAR_MIN

- *       WCHAR_MAX

- *       (u)int64_t

- *       PTRDIFF_MIN

- *       PTRDIFF_MAX

- *       (u)intptr_t

- *

- *    9) The following have not been defined:

- *

- *       WINT_MIN

- *       WINT_MAX

- *

- *   10) The criteria for defining (u)int_least(*)_t isn't clear,

- *       except for systems which don't have a type that precisely

- *       defined 8, 16, or 32 bit types (which this include file does

- *       not support anyways). Default definitions have been given.

- *

- *   11) The criteria for defining (u)int_fast(*)_t isn't something I

- *       would trust to any particular compiler vendor or the ANSI C

- *       committee.  It is well known that "compatible systems" are

- *       commonly created that have very different performance

- *       characteristics from the systems they are compatible with,

- *       especially those whose vendors make both the compiler and the

- *       system.  Default definitions have been given, but its strongly

- *       recommended that users never use these definitions for any

- *       reason (they do *NOT* deliver any serious guarantee of

- *       improved performance -- not in this file, nor any vendor's

- *       stdint.h).

- *

- *   12) The following macros:

- *

- *       PRINTF_INTMAX_MODIFIER

- *       PRINTF_INT64_MODIFIER

- *       PRINTF_INT32_MODIFIER

- *       PRINTF_INT16_MODIFIER

- *       PRINTF_LEAST64_MODIFIER

- *       PRINTF_LEAST32_MODIFIER

- *       PRINTF_LEAST16_MODIFIER

- *       PRINTF_INTPTR_MODIFIER

- *

- *       are strings which have been defined as the modifiers required

- *       for the "d", "u" and "x" printf formats to correctly output

- *       (u)intmax_t, (u)int64_t, (u)int32_t, (u)int16_t, (u)least64_t,

- *       (u)least32_t, (u)least16_t and (u)intptr_t types respectively.

- *       PRINTF_INTPTR_MODIFIER is not defined for some systems which

- *       provide their own stdint.h.  PRINTF_INT64_MODIFIER is not

- *       defined if INT64_MAX is not defined.  These are an extension

- *       beyond what C99 specifies must be in stdint.h.

- *

- *       In addition, the following macros are defined:

- *

- *       PRINTF_INTMAX_HEX_WIDTH

- *       PRINTF_INT64_HEX_WIDTH

- *       PRINTF_INT32_HEX_WIDTH

- *       PRINTF_INT16_HEX_WIDTH

- *       PRINTF_INT8_HEX_WIDTH

- *       PRINTF_INTMAX_DEC_WIDTH

- *       PRINTF_INT64_DEC_WIDTH

- *       PRINTF_INT32_DEC_WIDTH

- *       PRINTF_INT16_DEC_WIDTH

- *       PRINTF_INT8_DEC_WIDTH

- *

- *       Which specifies the maximum number of characters required to

- *       print the number of that type in either hexadecimal or decimal.

- *       These are an extension beyond what C99 specifies must be in

- *       stdint.h.

- *

- *  Compilers tested (all with 0 warnings at their highest respective

- *  settings): Borland Turbo C 2.0, WATCOM C/C++ 11.0 (16 bits and 32

- *  bits), Microsoft Visual C++ 6.0 (32 bit), Microsoft Visual Studio

- *  .net (VC7), Intel C++ 4.0, GNU gcc v3.3.3

- *

- *  This file should be considered a work in progress.  Suggestions for

- *  improvements, especially those which increase coverage are strongly

- *  encouraged.

- *

- *  Acknowledgements

- *

- *  The following people have made significant contributions to the

- *  development and testing of this file:

- *

- *  Chris Howie

- *  John Steele Scott

- *  Dave Thorup

- *

- */

-

-#include <stddef.h>

-#include <limits.h>

-#include <signal.h>

-

-/*

- *  For gcc with _STDINT_H, fill in the PRINTF_INT*_MODIFIER macros, and

- *  do nothing else.  On the Mac OS X version of gcc this is _STDINT_H_.

- */

-

-#if ((defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L) || (defined (__WATCOMC__) && (defined (_STDINT_H_INCLUDED) || __WATCOMC__ >= 1250)) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_)) )) && !defined (_PSTDINT_H_INCLUDED)

-#include <stdint.h>

-#define _PSTDINT_H_INCLUDED

-# ifndef PRINTF_INT64_MODIFIER

-#  define PRINTF_INT64_MODIFIER "ll"

-# endif

-# ifndef PRINTF_INT32_MODIFIER

-#  define PRINTF_INT32_MODIFIER "l"

-# endif

-# ifndef PRINTF_INT16_MODIFIER

-#  define PRINTF_INT16_MODIFIER "h"

-# endif

-# ifndef PRINTF_INTMAX_MODIFIER

-#  define PRINTF_INTMAX_MODIFIER PRINTF_INT64_MODIFIER

-# endif

-# ifndef PRINTF_INT64_HEX_WIDTH

-#  define PRINTF_INT64_HEX_WIDTH "16"

-# endif

-# ifndef PRINTF_INT32_HEX_WIDTH

-#  define PRINTF_INT32_HEX_WIDTH "8"

-# endif

-# ifndef PRINTF_INT16_HEX_WIDTH

-#  define PRINTF_INT16_HEX_WIDTH "4"

-# endif

-# ifndef PRINTF_INT8_HEX_WIDTH

-#  define PRINTF_INT8_HEX_WIDTH "2"

-# endif

-# ifndef PRINTF_INT64_DEC_WIDTH

-#  define PRINTF_INT64_DEC_WIDTH "20"

-# endif

-# ifndef PRINTF_INT32_DEC_WIDTH

-#  define PRINTF_INT32_DEC_WIDTH "10"

-# endif

-# ifndef PRINTF_INT16_DEC_WIDTH

-#  define PRINTF_INT16_DEC_WIDTH "5"

-# endif

-# ifndef PRINTF_INT8_DEC_WIDTH

-#  define PRINTF_INT8_DEC_WIDTH "3"

-# endif

-# ifndef PRINTF_INTMAX_HEX_WIDTH

-#  define PRINTF_INTMAX_HEX_WIDTH PRINTF_INT64_HEX_WIDTH

-# endif

-# ifndef PRINTF_INTMAX_DEC_WIDTH

-#  define PRINTF_INTMAX_DEC_WIDTH PRINTF_INT64_DEC_WIDTH

-# endif

-

-/*

- *  Something really weird is going on with Open Watcom.  Just pull some of

- *  these duplicated definitions from Open Watcom's stdint.h file for now.

- */

-

-# if defined (__WATCOMC__) && __WATCOMC__ >= 1250

-#  if !defined (INT64_C)

-#   define INT64_C(x)   (x + (INT64_MAX - INT64_MAX))

-#  endif

-#  if !defined (UINT64_C)

-#   define UINT64_C(x)  (x + (UINT64_MAX - UINT64_MAX))

-#  endif

-#  if !defined (INT32_C)

-#   define INT32_C(x)   (x + (INT32_MAX - INT32_MAX))

-#  endif

-#  if !defined (UINT32_C)

-#   define UINT32_C(x)  (x + (UINT32_MAX - UINT32_MAX))

-#  endif

-#  if !defined (INT16_C)

-#   define INT16_C(x)   (x)

-#  endif

-#  if !defined (UINT16_C)

-#   define UINT16_C(x)  (x)

-#  endif

-#  if !defined (INT8_C)

-#   define INT8_C(x)   (x)

-#  endif

-#  if !defined (UINT8_C)

-#   define UINT8_C(x)  (x)

-#  endif

-#  if !defined (UINT64_MAX)

-#   define UINT64_MAX  18446744073709551615ULL

-#  endif

-#  if !defined (INT64_MAX)

-#   define INT64_MAX  9223372036854775807LL

-#  endif

-#  if !defined (UINT32_MAX)

-#   define UINT32_MAX  4294967295UL

-#  endif

-#  if !defined (INT32_MAX)

-#   define INT32_MAX  2147483647L

-#  endif

-#  if !defined (INTMAX_MAX)

-#   define INTMAX_MAX INT64_MAX

-#  endif

-#  if !defined (INTMAX_MIN)

-#   define INTMAX_MIN INT64_MIN

-#  endif

-# endif

-#endif

-

-#ifndef _PSTDINT_H_INCLUDED

-#define _PSTDINT_H_INCLUDED

-

-#ifndef SIZE_MAX

-# define SIZE_MAX (~(size_t)0)

-#endif

-

-/*

- *  Deduce the type assignments from limits.h under the assumption that

- *  integer sizes in bits are powers of 2, and follow the ANSI

- *  definitions.

- */

-

-#ifndef UINT8_MAX

-# define UINT8_MAX 0xff

-#endif

-#ifndef uint8_t

-# if (UCHAR_MAX == UINT8_MAX) || defined (S_SPLINT_S)

-    typedef unsigned char uint8_t;

-#   define UINT8_C(v) ((uint8_t) v)

-# else

-#   error "Platform not supported"

-# endif

-#endif

-

-#ifndef INT8_MAX

-# define INT8_MAX 0x7f

-#endif

-#ifndef INT8_MIN

-# define INT8_MIN INT8_C(0x80)

-#endif

-#ifndef int8_t

-# if (SCHAR_MAX == INT8_MAX) || defined (S_SPLINT_S)

-    typedef signed char int8_t;

-#   define INT8_C(v) ((int8_t) v)

-# else

-#   error "Platform not supported"

-# endif

-#endif

-

-#ifndef UINT16_MAX

-# define UINT16_MAX 0xffff

-#endif

-#ifndef uint16_t

-#if (UINT_MAX == UINT16_MAX) || defined (S_SPLINT_S)

-  typedef unsigned int uint16_t;

-# ifndef PRINTF_INT16_MODIFIER

-#  define PRINTF_INT16_MODIFIER ""

-# endif

-# define UINT16_C(v) ((uint16_t) (v))

-#elif (USHRT_MAX == UINT16_MAX)

-  typedef unsigned short uint16_t;

-# define UINT16_C(v) ((uint16_t) (v))

-# ifndef PRINTF_INT16_MODIFIER

-#  define PRINTF_INT16_MODIFIER "h"

-# endif

-#else

-#error "Platform not supported"

-#endif

-#endif

-

-#ifndef INT16_MAX

-# define INT16_MAX 0x7fff

-#endif

-#ifndef INT16_MIN

-# define INT16_MIN INT16_C(0x8000)

-#endif

-#ifndef int16_t

-#if (INT_MAX == INT16_MAX) || defined (S_SPLINT_S)

-  typedef signed int int16_t;

-# define INT16_C(v) ((int16_t) (v))

-# ifndef PRINTF_INT16_MODIFIER

-#  define PRINTF_INT16_MODIFIER ""

-# endif

-#elif (SHRT_MAX == INT16_MAX)

-  typedef signed short int16_t;

-# define INT16_C(v) ((int16_t) (v))

-# ifndef PRINTF_INT16_MODIFIER

-#  define PRINTF_INT16_MODIFIER "h"

-# endif

-#else

-#error "Platform not supported"

-#endif

-#endif

-

-#ifndef UINT32_MAX

-# define UINT32_MAX (0xffffffffUL)

-#endif

-#ifndef uint32_t

-#if (ULONG_MAX == UINT32_MAX) || defined (S_SPLINT_S)

-  typedef unsigned long uint32_t;

-# define UINT32_C(v) v ## UL

-# ifndef PRINTF_INT32_MODIFIER

-#  define PRINTF_INT32_MODIFIER "l"

-# endif

-#elif (UINT_MAX == UINT32_MAX)

-  typedef unsigned int uint32_t;

-# ifndef PRINTF_INT32_MODIFIER

-#  define PRINTF_INT32_MODIFIER ""

-# endif

-# define UINT32_C(v) v ## U

-#elif (USHRT_MAX == UINT32_MAX)

-  typedef unsigned short uint32_t;

-# define UINT32_C(v) ((unsigned short) (v))

-# ifndef PRINTF_INT32_MODIFIER

-#  define PRINTF_INT32_MODIFIER ""

-# endif

-#else

-#error "Platform not supported"

-#endif

-#endif

-

-#ifndef INT32_MAX

-# define INT32_MAX (0x7fffffffL)

-#endif

-#ifndef INT32_MIN

-# define INT32_MIN INT32_C(0x80000000)

-#endif

-#ifndef int32_t

-#if (LONG_MAX == INT32_MAX) || defined (S_SPLINT_S)

-  typedef signed long int32_t;

-# define INT32_C(v) v ## L

-# ifndef PRINTF_INT32_MODIFIER

-#  define PRINTF_INT32_MODIFIER "l"

-# endif

-#elif (INT_MAX == INT32_MAX)

-  typedef signed int int32_t;

-# define INT32_C(v) v

-# ifndef PRINTF_INT32_MODIFIER

-#  define PRINTF_INT32_MODIFIER ""

-# endif

-#elif (SHRT_MAX == INT32_MAX)

-  typedef signed short int32_t;

-# define INT32_C(v) ((short) (v))

-# ifndef PRINTF_INT32_MODIFIER

-#  define PRINTF_INT32_MODIFIER ""

-# endif

-#else

-#error "Platform not supported"

-#endif

-#endif

-

-/*

- *  The macro stdint_int64_defined is temporarily used to record

- *  whether or not 64 integer support is available.  It must be

- *  defined for any 64 integer extensions for new platforms that are

- *  added.

- */

-

-#undef stdint_int64_defined

-#if (defined(__STDC__) && defined(__STDC_VERSION__)) || defined (S_SPLINT_S)

-# if (__STDC__ && __STDC_VERSION >= 199901L) || defined (S_SPLINT_S)

-#  define stdint_int64_defined

-   typedef long long int64_t;

-   typedef unsigned long long uint64_t;

-#  define UINT64_C(v) v ## ULL

-#  define  INT64_C(v) v ## LL

-#  ifndef PRINTF_INT64_MODIFIER

-#   define PRINTF_INT64_MODIFIER "ll"

-#  endif

-# endif

-#endif

-

-#if !defined (stdint_int64_defined)

-# if defined(__GNUC__)

-#  define stdint_int64_defined

-   __extension__ typedef long long int64_t;

-   __extension__ typedef unsigned long long uint64_t;

-#  define UINT64_C(v) v ## ULL

-#  define  INT64_C(v) v ## LL

-#  ifndef PRINTF_INT64_MODIFIER

-#   define PRINTF_INT64_MODIFIER "ll"

-#  endif

-# elif defined(__MWERKS__) || defined (__SUNPRO_C) || defined (__SUNPRO_CC) || defined (__APPLE_CC__) || defined (_LONG_LONG) || defined (_CRAYC) || defined (S_SPLINT_S)

-#  define stdint_int64_defined

-   typedef long long int64_t;

-   typedef unsigned long long uint64_t;

-#  define UINT64_C(v) v ## ULL

-#  define  INT64_C(v) v ## LL

-#  ifndef PRINTF_INT64_MODIFIER

-#   define PRINTF_INT64_MODIFIER "ll"

-#  endif

-# elif (defined(__WATCOMC__) && defined(__WATCOM_INT64__)) || (defined(_MSC_VER) && _INTEGRAL_MAX_BITS >= 64) || (defined (__BORLANDC__) && __BORLANDC__ > 0x460) || defined (__alpha) || defined (__DECC)

-#  define stdint_int64_defined

-   typedef __int64 int64_t;

-   typedef unsigned __int64 uint64_t;

-#  define UINT64_C(v) v ## UI64

-#  define  INT64_C(v) v ## I64

-#  ifndef PRINTF_INT64_MODIFIER

-#   define PRINTF_INT64_MODIFIER "I64"

-#  endif

-# endif

-#endif

-

-#if !defined (LONG_LONG_MAX) && defined (INT64_C)

-# define LONG_LONG_MAX INT64_C (9223372036854775807)

-#endif

-#ifndef ULONG_LONG_MAX

-# define ULONG_LONG_MAX UINT64_C (18446744073709551615)

-#endif

-

-#if !defined (INT64_MAX) && defined (INT64_C)

-# define INT64_MAX INT64_C (9223372036854775807)

-#endif

-#if !defined (INT64_MIN) && defined (INT64_C)

-# define INT64_MIN INT64_C (-9223372036854775808)

-#endif

-#if !defined (UINT64_MAX) && defined (INT64_C)

-# define UINT64_MAX UINT64_C (18446744073709551615)

-#endif

-

-/*

- *  Width of hexadecimal for number field.

- */

-

-#ifndef PRINTF_INT64_HEX_WIDTH

-# define PRINTF_INT64_HEX_WIDTH "16"

-#endif

-#ifndef PRINTF_INT32_HEX_WIDTH

-# define PRINTF_INT32_HEX_WIDTH "8"

-#endif

-#ifndef PRINTF_INT16_HEX_WIDTH

-# define PRINTF_INT16_HEX_WIDTH "4"

-#endif

-#ifndef PRINTF_INT8_HEX_WIDTH

-# define PRINTF_INT8_HEX_WIDTH "2"

-#endif

-

-#ifndef PRINTF_INT64_DEC_WIDTH

-# define PRINTF_INT64_DEC_WIDTH "20"

-#endif

-#ifndef PRINTF_INT32_DEC_WIDTH

-# define PRINTF_INT32_DEC_WIDTH "10"

-#endif

-#ifndef PRINTF_INT16_DEC_WIDTH

-# define PRINTF_INT16_DEC_WIDTH "5"

-#endif

-#ifndef PRINTF_INT8_DEC_WIDTH

-# define PRINTF_INT8_DEC_WIDTH "3"

-#endif

-

-/*

- *  Ok, lets not worry about 128 bit integers for now.  Moore's law says

- *  we don't need to worry about that until about 2040 at which point

- *  we'll have bigger things to worry about.

- */

-

-#ifdef stdint_int64_defined

-  typedef int64_t intmax_t;

-  typedef uint64_t uintmax_t;

-# define  INTMAX_MAX   INT64_MAX

-# define  INTMAX_MIN   INT64_MIN

-# define UINTMAX_MAX  UINT64_MAX

-# define UINTMAX_C(v) UINT64_C(v)

-# define  INTMAX_C(v)  INT64_C(v)

-# ifndef PRINTF_INTMAX_MODIFIER

-#   define PRINTF_INTMAX_MODIFIER PRINTF_INT64_MODIFIER

-# endif

-# ifndef PRINTF_INTMAX_HEX_WIDTH

-#  define PRINTF_INTMAX_HEX_WIDTH PRINTF_INT64_HEX_WIDTH

-# endif

-# ifndef PRINTF_INTMAX_DEC_WIDTH

-#  define PRINTF_INTMAX_DEC_WIDTH PRINTF_INT64_DEC_WIDTH

-# endif

-#else

-  typedef int32_t intmax_t;

-  typedef uint32_t uintmax_t;

-# define  INTMAX_MAX   INT32_MAX

-# define UINTMAX_MAX  UINT32_MAX

-# define UINTMAX_C(v) UINT32_C(v)

-# define  INTMAX_C(v)  INT32_C(v)

-# ifndef PRINTF_INTMAX_MODIFIER

-#   define PRINTF_INTMAX_MODIFIER PRINTF_INT32_MODIFIER

-# endif

-# ifndef PRINTF_INTMAX_HEX_WIDTH

-#  define PRINTF_INTMAX_HEX_WIDTH PRINTF_INT32_HEX_WIDTH

-# endif

-# ifndef PRINTF_INTMAX_DEC_WIDTH

-#  define PRINTF_INTMAX_DEC_WIDTH PRINTF_INT32_DEC_WIDTH

-# endif

-#endif

-

-/*

- *  Because this file currently only supports platforms which have

- *  precise powers of 2 as bit sizes for the default integers, the

- *  least definitions are all trivial.  Its possible that a future

- *  version of this file could have different definitions.

- */

-

-#ifndef stdint_least_defined

-  typedef   int8_t   int_least8_t;

-  typedef  uint8_t  uint_least8_t;

-  typedef  int16_t  int_least16_t;

-  typedef uint16_t uint_least16_t;

-  typedef  int32_t  int_least32_t;

-  typedef uint32_t uint_least32_t;

-# define PRINTF_LEAST32_MODIFIER PRINTF_INT32_MODIFIER

-# define PRINTF_LEAST16_MODIFIER PRINTF_INT16_MODIFIER

-# define  UINT_LEAST8_MAX  UINT8_MAX

-# define   INT_LEAST8_MAX   INT8_MAX

-# define UINT_LEAST16_MAX UINT16_MAX

-# define  INT_LEAST16_MAX  INT16_MAX

-# define UINT_LEAST32_MAX UINT32_MAX

-# define  INT_LEAST32_MAX  INT32_MAX

-# define   INT_LEAST8_MIN   INT8_MIN

-# define  INT_LEAST16_MIN  INT16_MIN

-# define  INT_LEAST32_MIN  INT32_MIN

-# ifdef stdint_int64_defined

-    typedef  int64_t  int_least64_t;

-    typedef uint64_t uint_least64_t;

-#   define PRINTF_LEAST64_MODIFIER PRINTF_INT64_MODIFIER

-#   define UINT_LEAST64_MAX UINT64_MAX

-#   define  INT_LEAST64_MAX  INT64_MAX

-#   define  INT_LEAST64_MIN  INT64_MIN

-# endif

-#endif

-#undef stdint_least_defined

-

-/*

- *  The ANSI C committee pretending to know or specify anything about

- *  performance is the epitome of misguided arrogance.  The mandate of

- *  this file is to *ONLY* ever support that absolute minimum

- *  definition of the fast integer types, for compatibility purposes.

- *  No extensions, and no attempt to suggest what may or may not be a

- *  faster integer type will ever be made in this file.  Developers are

- *  warned to stay away from these types when using this or any other

- *  stdint.h.

- */

-

-typedef   int_least8_t   int_fast8_t;

-typedef  uint_least8_t  uint_fast8_t;

-typedef  int_least16_t  int_fast16_t;

-typedef uint_least16_t uint_fast16_t;

-typedef  int_least32_t  int_fast32_t;

-typedef uint_least32_t uint_fast32_t;

-#define  UINT_FAST8_MAX  UINT_LEAST8_MAX

-#define   INT_FAST8_MAX   INT_LEAST8_MAX

-#define UINT_FAST16_MAX UINT_LEAST16_MAX

-#define  INT_FAST16_MAX  INT_LEAST16_MAX

-#define UINT_FAST32_MAX UINT_LEAST32_MAX

-#define  INT_FAST32_MAX  INT_LEAST32_MAX

-#define   INT_FAST8_MIN   INT_LEAST8_MIN

-#define  INT_FAST16_MIN  INT_LEAST16_MIN

-#define  INT_FAST32_MIN  INT_LEAST32_MIN

-#ifdef stdint_int64_defined

-  typedef  int_least64_t  int_fast64_t;

-  typedef uint_least64_t uint_fast64_t;

-# define UINT_FAST64_MAX UINT_LEAST64_MAX

-# define  INT_FAST64_MAX  INT_LEAST64_MAX

-# define  INT_FAST64_MIN  INT_LEAST64_MIN

-#endif

-

-#undef stdint_int64_defined

-

-/*

- *  Whatever piecemeal, per compiler thing we can do about the wchar_t

- *  type limits.

- */

-

-#if defined(__WATCOMC__) || defined(_MSC_VER) || defined (__GNUC__)

-# include <wchar.h>

-# ifndef WCHAR_MIN

-#  define WCHAR_MIN 0

-# endif

-# ifndef WCHAR_MAX

-#  define WCHAR_MAX ((wchar_t)-1)

-# endif

-#endif

-

-/*

- *  Whatever piecemeal, per compiler/platform thing we can do about the

- *  (u)intptr_t types and limits.

- */

-

-#if defined (_MSC_VER) && defined (_UINTPTR_T_DEFINED)

-# define STDINT_H_UINTPTR_T_DEFINED

-#endif

-

-#ifndef STDINT_H_UINTPTR_T_DEFINED

-# if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) || defined (_WIN64)

-#  define stdint_intptr_bits 64

-# elif defined (__WATCOMC__) || defined (__TURBOC__)

-#  if defined(__TINY__) || defined(__SMALL__) || defined(__MEDIUM__)

-#    define stdint_intptr_bits 16

-#  else

-#    define stdint_intptr_bits 32

-#  endif

-# elif defined (__i386__) || defined (_WIN32) || defined (WIN32)

-#  define stdint_intptr_bits 32

-# elif defined (__INTEL_COMPILER)

-/* TODO -- what will Intel do about x86-64? */

-# endif

-

-# ifdef stdint_intptr_bits

-#  define stdint_intptr_glue3_i(a,b,c)  a##b##c

-#  define stdint_intptr_glue3(a,b,c)    stdint_intptr_glue3_i(a,b,c)

-#  ifndef PRINTF_INTPTR_MODIFIER

-#    define PRINTF_INTPTR_MODIFIER      stdint_intptr_glue3(PRINTF_INT,stdint_intptr_bits,_MODIFIER)

-#  endif

-#  ifndef PTRDIFF_MAX

-#    define PTRDIFF_MAX                 stdint_intptr_glue3(INT,stdint_intptr_bits,_MAX)

-#  endif

-#  ifndef PTRDIFF_MIN

-#    define PTRDIFF_MIN                 stdint_intptr_glue3(INT,stdint_intptr_bits,_MIN)

-#  endif

-#  ifndef UINTPTR_MAX

-#    define UINTPTR_MAX                 stdint_intptr_glue3(UINT,stdint_intptr_bits,_MAX)

-#  endif

-#  ifndef INTPTR_MAX

-#    define INTPTR_MAX                  stdint_intptr_glue3(INT,stdint_intptr_bits,_MAX)

-#  endif

-#  ifndef INTPTR_MIN

-#    define INTPTR_MIN                  stdint_intptr_glue3(INT,stdint_intptr_bits,_MIN)

-#  endif

-#  ifndef INTPTR_C

-#    define INTPTR_C(x)                 stdint_intptr_glue3(INT,stdint_intptr_bits,_C)(x)

-#  endif

-#  ifndef UINTPTR_C

-#    define UINTPTR_C(x)                stdint_intptr_glue3(UINT,stdint_intptr_bits,_C)(x)

-#  endif

-  typedef stdint_intptr_glue3(uint,stdint_intptr_bits,_t) uintptr_t;

-  typedef stdint_intptr_glue3( int,stdint_intptr_bits,_t)  intptr_t;

-# else

-/* TODO -- This following is likely wrong for some platforms, and does

-   nothing for the definition of uintptr_t. */

-  typedef ptrdiff_t intptr_t;

-# endif

-# define STDINT_H_UINTPTR_T_DEFINED

-#endif

-

-/*

- *  Assumes sig_atomic_t is signed and we have a 2s complement machine.

- */

-

-#ifndef SIG_ATOMIC_MAX

-# define SIG_ATOMIC_MAX ((((sig_atomic_t) 1) << (sizeof (sig_atomic_t)*CHAR_BIT-1)) - 1)

-#endif

-

-#endif

-

-#if defined (__TEST_PSTDINT_FOR_CORRECTNESS)

-

-/* 

- *  Please compile with the maximum warning settings to make sure macros are not

- *  defined more than once.

- */

- 

-#include <stdlib.h>

-#include <stdio.h>

-#include <string.h>

- 

-#define glue3_aux(x,y,z) x ## y ## z

-#define glue3(x,y,z) glue3_aux(x,y,z)

-

-#define DECLU(bits) glue3(uint,bits,_t) glue3(u,bits,=) glue3(UINT,bits,_C) (0);

-#define DECLI(bits) glue3(int,bits,_t) glue3(i,bits,=) glue3(INT,bits,_C) (0);

-

-#define DECL(us,bits) glue3(DECL,us,) (bits)

-

-#define TESTUMAX(bits) glue3(u,bits,=) glue3(~,u,bits); if (glue3(UINT,bits,_MAX) glue3(!=,u,bits)) printf ("Something wrong with UINT%d_MAX\n", bits)

- 

-int main () {

-	DECL(I,8)

-	DECL(U,8)

-	DECL(I,16)

-	DECL(U,16)

-	DECL(I,32)

-	DECL(U,32)

-#ifdef INT64_MAX

-	DECL(I,64)

-	DECL(U,64)

-#endif

-	intmax_t imax = INTMAX_C(0);

-	uintmax_t umax = UINTMAX_C(0);

-	char str0[256], str1[256];

-

-	sprintf (str0, "%d %x\n", 0, ~0);

-	

-	sprintf (str1, "%d %x\n",  i8, ~0);

-	if (0 != strcmp (str0, str1)) printf ("Something wrong with i8 : %s\n", str1);

-	sprintf (str1, "%u %x\n",  u8, ~0);

-	if (0 != strcmp (str0, str1)) printf ("Something wrong with u8 : %s\n", str1);

-	sprintf (str1, "%d %x\n",  i16, ~0);

-	if (0 != strcmp (str0, str1)) printf ("Something wrong with i16 : %s\n", str1);

-	sprintf (str1, "%u %x\n",  u16, ~0);

-	if (0 != strcmp (str0, str1)) printf ("Something wrong with u16 : %s\n", str1);	

-	sprintf (str1, "%" PRINTF_INT32_MODIFIER "d %x\n",  i32, ~0);

-	if (0 != strcmp (str0, str1)) printf ("Something wrong with i32 : %s\n", str1);

-	sprintf (str1, "%" PRINTF_INT32_MODIFIER "u %x\n",  u32, ~0);

-	if (0 != strcmp (str0, str1)) printf ("Something wrong with u32 : %s\n", str1);

-#ifdef INT64_MAX	

-	sprintf (str1, "%" PRINTF_INT64_MODIFIER "d %x\n",  i64, ~0);

-	if (0 != strcmp (str0, str1)) printf ("Something wrong with i64 : %s\n", str1);

-#endif

-	sprintf (str1, "%" PRINTF_INTMAX_MODIFIER "d %x\n",  imax, ~0);

-	if (0 != strcmp (str0, str1)) printf ("Something wrong with imax : %s\n", str1);

-	sprintf (str1, "%" PRINTF_INTMAX_MODIFIER "u %x\n",  umax, ~0);

-	if (0 != strcmp (str0, str1)) printf ("Something wrong with umax : %s\n", str1);	

-	

-	TESTUMAX(8);

-	TESTUMAX(16);

-	TESTUMAX(32);

-#ifdef INT64_MAX

-	TESTUMAX(64);

-#endif

-

-	return EXIT_SUCCESS;

-}

-

-#endif

+/*  A portable stdint.h
+ ****************************************************************************
+ *  BSD License:
+ ****************************************************************************
+ *
+ *  Copyright (c) 2005-2007 Paul Hsieh
+ *  All rights reserved.
+ *  
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *  1. Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *  2. Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *  3. The name of the author may not be used to endorse or promote products
+ *     derived from this software without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ *  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ *  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************
+ *
+ *  Version 0.1.11
+ *
+ *  The ANSI C standard committee, for the C99 standard, specified the
+ *  inclusion of a new standard include file called stdint.h.  This is
+ *  a very useful and long desired include file which contains several
+ *  very precise definitions for integer scalar types that is
+ *  critically important for making portable several classes of
+ *  applications including cryptography, hashing, variable length
+ *  integer libraries and so on.  But for most developers its likely
+ *  useful just for programming sanity.
+ *
+ *  The problem is that most compiler vendors have decided not to
+ *  implement the C99 standard, and the next C++ language standard
+ *  (which has a lot more mindshare these days) will be a long time in
+ *  coming and its unknown whether or not it will include stdint.h or
+ *  how much adoption it will have.  Either way, it will be a long time
+ *  before all compilers come with a stdint.h and it also does nothing
+ *  for the extremely large number of compilers available today which
+ *  do not include this file, or anything comparable to it.
+ *
+ *  So that's what this file is all about.  Its an attempt to build a
+ *  single universal include file that works on as many platforms as
+ *  possible to deliver what stdint.h is supposed to.  A few things
+ *  that should be noted about this file:
+ *
+ *    1) It is not guaranteed to be portable and/or present an identical
+ *       interface on all platforms.  The extreme variability of the
+ *       ANSI C standard makes this an impossibility right from the
+ *       very get go. Its really only meant to be useful for the vast
+ *       majority of platforms that possess the capability of
+ *       implementing usefully and precisely defined, standard sized
+ *       integer scalars.  Systems which are not intrinsically 2s
+ *       complement may produce invalid constants.
+ *
+ *    2) There is an unavoidable use of non-reserved symbols.
+ *
+ *    3) Other standard include files are invoked.
+ *
+ *    4) This file may come in conflict with future platforms that do
+ *       include stdint.h.  The hope is that one or the other can be
+ *       used with no real difference.
+ *
+ *    5) In the current verison, if your platform can't represent
+ *       int32_t, int16_t and int8_t, it just dumps out with a compiler
+ *       error.
+ *
+ *    6) 64 bit integers may or may not be defined.  Test for their
+ *       presence with the test: #ifdef INT64_MAX or #ifdef UINT64_MAX.
+ *       Note that this is different from the C99 specification which
+ *       requires the existence of 64 bit support in the compiler.  If
+ *       this is not defined for your platform, yet it is capable of
+ *       dealing with 64 bits then it is because this file has not yet
+ *       been extended to cover all of your system's capabilities.
+ *
+ *    7) (u)intptr_t may or may not be defined.  Test for its presence
+ *       with the test: #ifdef PTRDIFF_MAX.  If this is not defined
+ *       for your platform, then it is because this file has not yet
+ *       been extended to cover all of your system's capabilities, not
+ *       because its optional.
+ *
+ *    8) The following might not been defined even if your platform is
+ *       capable of defining it:
+ *
+ *       WCHAR_MIN
+ *       WCHAR_MAX
+ *       (u)int64_t
+ *       PTRDIFF_MIN
+ *       PTRDIFF_MAX
+ *       (u)intptr_t
+ *
+ *    9) The following have not been defined:
+ *
+ *       WINT_MIN
+ *       WINT_MAX
+ *
+ *   10) The criteria for defining (u)int_least(*)_t isn't clear,
+ *       except for systems which don't have a type that precisely
+ *       defined 8, 16, or 32 bit types (which this include file does
+ *       not support anyways). Default definitions have been given.
+ *
+ *   11) The criteria for defining (u)int_fast(*)_t isn't something I
+ *       would trust to any particular compiler vendor or the ANSI C
+ *       committee.  It is well known that "compatible systems" are
+ *       commonly created that have very different performance
+ *       characteristics from the systems they are compatible with,
+ *       especially those whose vendors make both the compiler and the
+ *       system.  Default definitions have been given, but its strongly
+ *       recommended that users never use these definitions for any
+ *       reason (they do *NOT* deliver any serious guarantee of
+ *       improved performance -- not in this file, nor any vendor's
+ *       stdint.h).
+ *
+ *   12) The following macros:
+ *
+ *       PRINTF_INTMAX_MODIFIER
+ *       PRINTF_INT64_MODIFIER
+ *       PRINTF_INT32_MODIFIER
+ *       PRINTF_INT16_MODIFIER
+ *       PRINTF_LEAST64_MODIFIER
+ *       PRINTF_LEAST32_MODIFIER
+ *       PRINTF_LEAST16_MODIFIER
+ *       PRINTF_INTPTR_MODIFIER
+ *
+ *       are strings which have been defined as the modifiers required
+ *       for the "d", "u" and "x" printf formats to correctly output
+ *       (u)intmax_t, (u)int64_t, (u)int32_t, (u)int16_t, (u)least64_t,
+ *       (u)least32_t, (u)least16_t and (u)intptr_t types respectively.
+ *       PRINTF_INTPTR_MODIFIER is not defined for some systems which
+ *       provide their own stdint.h.  PRINTF_INT64_MODIFIER is not
+ *       defined if INT64_MAX is not defined.  These are an extension
+ *       beyond what C99 specifies must be in stdint.h.
+ *
+ *       In addition, the following macros are defined:
+ *
+ *       PRINTF_INTMAX_HEX_WIDTH
+ *       PRINTF_INT64_HEX_WIDTH
+ *       PRINTF_INT32_HEX_WIDTH
+ *       PRINTF_INT16_HEX_WIDTH
+ *       PRINTF_INT8_HEX_WIDTH
+ *       PRINTF_INTMAX_DEC_WIDTH
+ *       PRINTF_INT64_DEC_WIDTH
+ *       PRINTF_INT32_DEC_WIDTH
+ *       PRINTF_INT16_DEC_WIDTH
+ *       PRINTF_INT8_DEC_WIDTH
+ *
+ *       Which specifies the maximum number of characters required to
+ *       print the number of that type in either hexadecimal or decimal.
+ *       These are an extension beyond what C99 specifies must be in
+ *       stdint.h.
+ *
+ *  Compilers tested (all with 0 warnings at their highest respective
+ *  settings): Borland Turbo C 2.0, WATCOM C/C++ 11.0 (16 bits and 32
+ *  bits), Microsoft Visual C++ 6.0 (32 bit), Microsoft Visual Studio
+ *  .net (VC7), Intel C++ 4.0, GNU gcc v3.3.3
+ *
+ *  This file should be considered a work in progress.  Suggestions for
+ *  improvements, especially those which increase coverage are strongly
+ *  encouraged.
+ *
+ *  Acknowledgements
+ *
+ *  The following people have made significant contributions to the
+ *  development and testing of this file:
+ *
+ *  Chris Howie
+ *  John Steele Scott
+ *  Dave Thorup
+ *
+ */
+
+#include <stddef.h>
+#include <limits.h>
+#include <signal.h>
+
+/*
+ *  For gcc with _STDINT_H, fill in the PRINTF_INT*_MODIFIER macros, and
+ *  do nothing else.  On the Mac OS X version of gcc this is _STDINT_H_.
+ */
+
+#if ((defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L) || (defined (__WATCOMC__) && (defined (_STDINT_H_INCLUDED) || __WATCOMC__ >= 1250)) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_)) )) && !defined (_PSTDINT_H_INCLUDED)
+#include <stdint.h>
+#define _PSTDINT_H_INCLUDED
+# ifndef PRINTF_INT64_MODIFIER
+#  define PRINTF_INT64_MODIFIER "ll"
+# endif
+# ifndef PRINTF_INT32_MODIFIER
+#  define PRINTF_INT32_MODIFIER "l"
+# endif
+# ifndef PRINTF_INT16_MODIFIER
+#  define PRINTF_INT16_MODIFIER "h"
+# endif
+# ifndef PRINTF_INTMAX_MODIFIER
+#  define PRINTF_INTMAX_MODIFIER PRINTF_INT64_MODIFIER
+# endif
+# ifndef PRINTF_INT64_HEX_WIDTH
+#  define PRINTF_INT64_HEX_WIDTH "16"
+# endif
+# ifndef PRINTF_INT32_HEX_WIDTH
+#  define PRINTF_INT32_HEX_WIDTH "8"
+# endif
+# ifndef PRINTF_INT16_HEX_WIDTH
+#  define PRINTF_INT16_HEX_WIDTH "4"
+# endif
+# ifndef PRINTF_INT8_HEX_WIDTH
+#  define PRINTF_INT8_HEX_WIDTH "2"
+# endif
+# ifndef PRINTF_INT64_DEC_WIDTH
+#  define PRINTF_INT64_DEC_WIDTH "20"
+# endif
+# ifndef PRINTF_INT32_DEC_WIDTH
+#  define PRINTF_INT32_DEC_WIDTH "10"
+# endif
+# ifndef PRINTF_INT16_DEC_WIDTH
+#  define PRINTF_INT16_DEC_WIDTH "5"
+# endif
+# ifndef PRINTF_INT8_DEC_WIDTH
+#  define PRINTF_INT8_DEC_WIDTH "3"
+# endif
+# ifndef PRINTF_INTMAX_HEX_WIDTH
+#  define PRINTF_INTMAX_HEX_WIDTH PRINTF_INT64_HEX_WIDTH
+# endif
+# ifndef PRINTF_INTMAX_DEC_WIDTH
+#  define PRINTF_INTMAX_DEC_WIDTH PRINTF_INT64_DEC_WIDTH
+# endif
+
+/*
+ *  Something really weird is going on with Open Watcom.  Just pull some of
+ *  these duplicated definitions from Open Watcom's stdint.h file for now.
+ */
+
+# if defined (__WATCOMC__) && __WATCOMC__ >= 1250
+#  if !defined (INT64_C)
+#   define INT64_C(x)   (x + (INT64_MAX - INT64_MAX))
+#  endif
+#  if !defined (UINT64_C)
+#   define UINT64_C(x)  (x + (UINT64_MAX - UINT64_MAX))
+#  endif
+#  if !defined (INT32_C)
+#   define INT32_C(x)   (x + (INT32_MAX - INT32_MAX))
+#  endif
+#  if !defined (UINT32_C)
+#   define UINT32_C(x)  (x + (UINT32_MAX - UINT32_MAX))
+#  endif
+#  if !defined (INT16_C)
+#   define INT16_C(x)   (x)
+#  endif
+#  if !defined (UINT16_C)
+#   define UINT16_C(x)  (x)
+#  endif
+#  if !defined (INT8_C)
+#   define INT8_C(x)   (x)
+#  endif
+#  if !defined (UINT8_C)
+#   define UINT8_C(x)  (x)
+#  endif
+#  if !defined (UINT64_MAX)
+#   define UINT64_MAX  18446744073709551615ULL
+#  endif
+#  if !defined (INT64_MAX)
+#   define INT64_MAX  9223372036854775807LL
+#  endif
+#  if !defined (UINT32_MAX)
+#   define UINT32_MAX  4294967295UL
+#  endif
+#  if !defined (INT32_MAX)
+#   define INT32_MAX  2147483647L
+#  endif
+#  if !defined (INTMAX_MAX)
+#   define INTMAX_MAX INT64_MAX
+#  endif
+#  if !defined (INTMAX_MIN)
+#   define INTMAX_MIN INT64_MIN
+#  endif
+# endif
+#endif
+
+#ifndef _PSTDINT_H_INCLUDED
+#define _PSTDINT_H_INCLUDED
+
+#ifndef SIZE_MAX
+# define SIZE_MAX (~(size_t)0)
+#endif
+
+/*
+ *  Deduce the type assignments from limits.h under the assumption that
+ *  integer sizes in bits are powers of 2, and follow the ANSI
+ *  definitions.
+ */
+
+#ifndef UINT8_MAX
+# define UINT8_MAX 0xff
+#endif
+#ifndef uint8_t
+# if (UCHAR_MAX == UINT8_MAX) || defined (S_SPLINT_S)
+    typedef unsigned char uint8_t;
+#   define UINT8_C(v) ((uint8_t) v)
+# else
+#   error "Platform not supported"
+# endif
+#endif
+
+#ifndef INT8_MAX
+# define INT8_MAX 0x7f
+#endif
+#ifndef INT8_MIN
+# define INT8_MIN INT8_C(0x80)
+#endif
+#ifndef int8_t
+# if (SCHAR_MAX == INT8_MAX) || defined (S_SPLINT_S)
+    typedef signed char int8_t;
+#   define INT8_C(v) ((int8_t) v)
+# else
+#   error "Platform not supported"
+# endif
+#endif
+
+#ifndef UINT16_MAX
+# define UINT16_MAX 0xffff
+#endif
+#ifndef uint16_t
+#if (UINT_MAX == UINT16_MAX) || defined (S_SPLINT_S)
+  typedef unsigned int uint16_t;
+# ifndef PRINTF_INT16_MODIFIER
+#  define PRINTF_INT16_MODIFIER ""
+# endif
+# define UINT16_C(v) ((uint16_t) (v))
+#elif (USHRT_MAX == UINT16_MAX)
+  typedef unsigned short uint16_t;
+# define UINT16_C(v) ((uint16_t) (v))
+# ifndef PRINTF_INT16_MODIFIER
+#  define PRINTF_INT16_MODIFIER "h"
+# endif
+#else
+#error "Platform not supported"
+#endif
+#endif
+
+#ifndef INT16_MAX
+# define INT16_MAX 0x7fff
+#endif
+#ifndef INT16_MIN
+# define INT16_MIN INT16_C(0x8000)
+#endif
+#ifndef int16_t
+#if (INT_MAX == INT16_MAX) || defined (S_SPLINT_S)
+  typedef signed int int16_t;
+# define INT16_C(v) ((int16_t) (v))
+# ifndef PRINTF_INT16_MODIFIER
+#  define PRINTF_INT16_MODIFIER ""
+# endif
+#elif (SHRT_MAX == INT16_MAX)
+  typedef signed short int16_t;
+# define INT16_C(v) ((int16_t) (v))
+# ifndef PRINTF_INT16_MODIFIER
+#  define PRINTF_INT16_MODIFIER "h"
+# endif
+#else
+#error "Platform not supported"
+#endif
+#endif
+
+#ifndef UINT32_MAX
+# define UINT32_MAX (0xffffffffUL)
+#endif
+#ifndef uint32_t
+#if (ULONG_MAX == UINT32_MAX) || defined (S_SPLINT_S)
+  typedef unsigned long uint32_t;
+# define UINT32_C(v) v ## UL
+# ifndef PRINTF_INT32_MODIFIER
+#  define PRINTF_INT32_MODIFIER "l"
+# endif
+#elif (UINT_MAX == UINT32_MAX)
+  typedef unsigned int uint32_t;
+# ifndef PRINTF_INT32_MODIFIER
+#  define PRINTF_INT32_MODIFIER ""
+# endif
+# define UINT32_C(v) v ## U
+#elif (USHRT_MAX == UINT32_MAX)
+  typedef unsigned short uint32_t;
+# define UINT32_C(v) ((unsigned short) (v))
+# ifndef PRINTF_INT32_MODIFIER
+#  define PRINTF_INT32_MODIFIER ""
+# endif
+#else
+#error "Platform not supported"
+#endif
+#endif
+
+#ifndef INT32_MAX
+# define INT32_MAX (0x7fffffffL)
+#endif
+#ifndef INT32_MIN
+# define INT32_MIN INT32_C(0x80000000)
+#endif
+#ifndef int32_t
+#if (LONG_MAX == INT32_MAX) || defined (S_SPLINT_S)
+  typedef signed long int32_t;
+# define INT32_C(v) v ## L
+# ifndef PRINTF_INT32_MODIFIER
+#  define PRINTF_INT32_MODIFIER "l"
+# endif
+#elif (INT_MAX == INT32_MAX)
+  typedef signed int int32_t;
+# define INT32_C(v) v
+# ifndef PRINTF_INT32_MODIFIER
+#  define PRINTF_INT32_MODIFIER ""
+# endif
+#elif (SHRT_MAX == INT32_MAX)
+  typedef signed short int32_t;
+# define INT32_C(v) ((short) (v))
+# ifndef PRINTF_INT32_MODIFIER
+#  define PRINTF_INT32_MODIFIER ""
+# endif
+#else
+#error "Platform not supported"
+#endif
+#endif
+
+/*
+ *  The macro stdint_int64_defined is temporarily used to record
+ *  whether or not 64 integer support is available.  It must be
+ *  defined for any 64 integer extensions for new platforms that are
+ *  added.
+ */
+
+#undef stdint_int64_defined
+#if (defined(__STDC__) && defined(__STDC_VERSION__)) || defined (S_SPLINT_S)
+# if (__STDC__ && __STDC_VERSION >= 199901L) || defined (S_SPLINT_S)
+#  define stdint_int64_defined
+   typedef long long int64_t;
+   typedef unsigned long long uint64_t;
+#  define UINT64_C(v) v ## ULL
+#  define  INT64_C(v) v ## LL
+#  ifndef PRINTF_INT64_MODIFIER
+#   define PRINTF_INT64_MODIFIER "ll"
+#  endif
+# endif
+#endif
+
+#if !defined (stdint_int64_defined)
+# if defined(__GNUC__)
+#  define stdint_int64_defined
+   __extension__ typedef long long int64_t;
+   __extension__ typedef unsigned long long uint64_t;
+#  define UINT64_C(v) v ## ULL
+#  define  INT64_C(v) v ## LL
+#  ifndef PRINTF_INT64_MODIFIER
+#   define PRINTF_INT64_MODIFIER "ll"
+#  endif
+# elif defined(__MWERKS__) || defined (__SUNPRO_C) || defined (__SUNPRO_CC) || defined (__APPLE_CC__) || defined (_LONG_LONG) || defined (_CRAYC) || defined (S_SPLINT_S)
+#  define stdint_int64_defined
+   typedef long long int64_t;
+   typedef unsigned long long uint64_t;
+#  define UINT64_C(v) v ## ULL
+#  define  INT64_C(v) v ## LL
+#  ifndef PRINTF_INT64_MODIFIER
+#   define PRINTF_INT64_MODIFIER "ll"
+#  endif
+# elif (defined(__WATCOMC__) && defined(__WATCOM_INT64__)) || (defined(_MSC_VER) && _INTEGRAL_MAX_BITS >= 64) || (defined (__BORLANDC__) && __BORLANDC__ > 0x460) || defined (__alpha) || defined (__DECC)
+#  define stdint_int64_defined
+   typedef __int64 int64_t;
+   typedef unsigned __int64 uint64_t;
+#  define UINT64_C(v) v ## UI64
+#  define  INT64_C(v) v ## I64
+#  ifndef PRINTF_INT64_MODIFIER
+#   define PRINTF_INT64_MODIFIER "I64"
+#  endif
+# endif
+#endif
+
+#if !defined (LONG_LONG_MAX) && defined (INT64_C)
+# define LONG_LONG_MAX INT64_C (9223372036854775807)
+#endif
+#ifndef ULONG_LONG_MAX
+# define ULONG_LONG_MAX UINT64_C (18446744073709551615)
+#endif
+
+#if !defined (INT64_MAX) && defined (INT64_C)
+# define INT64_MAX INT64_C (9223372036854775807)
+#endif
+#if !defined (INT64_MIN) && defined (INT64_C)
+# define INT64_MIN INT64_C (-9223372036854775808)
+#endif
+#if !defined (UINT64_MAX) && defined (INT64_C)
+# define UINT64_MAX UINT64_C (18446744073709551615)
+#endif
+
+/*
+ *  Width of hexadecimal for number field.
+ */
+
+#ifndef PRINTF_INT64_HEX_WIDTH
+# define PRINTF_INT64_HEX_WIDTH "16"
+#endif
+#ifndef PRINTF_INT32_HEX_WIDTH
+# define PRINTF_INT32_HEX_WIDTH "8"
+#endif
+#ifndef PRINTF_INT16_HEX_WIDTH
+# define PRINTF_INT16_HEX_WIDTH "4"
+#endif
+#ifndef PRINTF_INT8_HEX_WIDTH
+# define PRINTF_INT8_HEX_WIDTH "2"
+#endif
+
+#ifndef PRINTF_INT64_DEC_WIDTH
+# define PRINTF_INT64_DEC_WIDTH "20"
+#endif
+#ifndef PRINTF_INT32_DEC_WIDTH
+# define PRINTF_INT32_DEC_WIDTH "10"
+#endif
+#ifndef PRINTF_INT16_DEC_WIDTH
+# define PRINTF_INT16_DEC_WIDTH "5"
+#endif
+#ifndef PRINTF_INT8_DEC_WIDTH
+# define PRINTF_INT8_DEC_WIDTH "3"
+#endif
+
+/*
+ *  Ok, lets not worry about 128 bit integers for now.  Moore's law says
+ *  we don't need to worry about that until about 2040 at which point
+ *  we'll have bigger things to worry about.
+ */
+
+#ifdef stdint_int64_defined
+  typedef int64_t intmax_t;
+  typedef uint64_t uintmax_t;
+# define  INTMAX_MAX   INT64_MAX
+# define  INTMAX_MIN   INT64_MIN
+# define UINTMAX_MAX  UINT64_MAX
+# define UINTMAX_C(v) UINT64_C(v)
+# define  INTMAX_C(v)  INT64_C(v)
+# ifndef PRINTF_INTMAX_MODIFIER
+#   define PRINTF_INTMAX_MODIFIER PRINTF_INT64_MODIFIER
+# endif
+# ifndef PRINTF_INTMAX_HEX_WIDTH
+#  define PRINTF_INTMAX_HEX_WIDTH PRINTF_INT64_HEX_WIDTH
+# endif
+# ifndef PRINTF_INTMAX_DEC_WIDTH
+#  define PRINTF_INTMAX_DEC_WIDTH PRINTF_INT64_DEC_WIDTH
+# endif
+#else
+  typedef int32_t intmax_t;
+  typedef uint32_t uintmax_t;
+# define  INTMAX_MAX   INT32_MAX
+# define UINTMAX_MAX  UINT32_MAX
+# define UINTMAX_C(v) UINT32_C(v)
+# define  INTMAX_C(v)  INT32_C(v)
+# ifndef PRINTF_INTMAX_MODIFIER
+#   define PRINTF_INTMAX_MODIFIER PRINTF_INT32_MODIFIER
+# endif
+# ifndef PRINTF_INTMAX_HEX_WIDTH
+#  define PRINTF_INTMAX_HEX_WIDTH PRINTF_INT32_HEX_WIDTH
+# endif
+# ifndef PRINTF_INTMAX_DEC_WIDTH
+#  define PRINTF_INTMAX_DEC_WIDTH PRINTF_INT32_DEC_WIDTH
+# endif
+#endif
+
+/*
+ *  Because this file currently only supports platforms which have
+ *  precise powers of 2 as bit sizes for the default integers, the
+ *  least definitions are all trivial.  Its possible that a future
+ *  version of this file could have different definitions.
+ */
+
+#ifndef stdint_least_defined
+  typedef   int8_t   int_least8_t;
+  typedef  uint8_t  uint_least8_t;
+  typedef  int16_t  int_least16_t;
+  typedef uint16_t uint_least16_t;
+  typedef  int32_t  int_least32_t;
+  typedef uint32_t uint_least32_t;
+# define PRINTF_LEAST32_MODIFIER PRINTF_INT32_MODIFIER
+# define PRINTF_LEAST16_MODIFIER PRINTF_INT16_MODIFIER
+# define  UINT_LEAST8_MAX  UINT8_MAX
+# define   INT_LEAST8_MAX   INT8_MAX
+# define UINT_LEAST16_MAX UINT16_MAX
+# define  INT_LEAST16_MAX  INT16_MAX
+# define UINT_LEAST32_MAX UINT32_MAX
+# define  INT_LEAST32_MAX  INT32_MAX
+# define   INT_LEAST8_MIN   INT8_MIN
+# define  INT_LEAST16_MIN  INT16_MIN
+# define  INT_LEAST32_MIN  INT32_MIN
+# ifdef stdint_int64_defined
+    typedef  int64_t  int_least64_t;
+    typedef uint64_t uint_least64_t;
+#   define PRINTF_LEAST64_MODIFIER PRINTF_INT64_MODIFIER
+#   define UINT_LEAST64_MAX UINT64_MAX
+#   define  INT_LEAST64_MAX  INT64_MAX
+#   define  INT_LEAST64_MIN  INT64_MIN
+# endif
+#endif
+#undef stdint_least_defined
+
+/*
+ *  The ANSI C committee pretending to know or specify anything about
+ *  performance is the epitome of misguided arrogance.  The mandate of
+ *  this file is to *ONLY* ever support that absolute minimum
+ *  definition of the fast integer types, for compatibility purposes.
+ *  No extensions, and no attempt to suggest what may or may not be a
+ *  faster integer type will ever be made in this file.  Developers are
+ *  warned to stay away from these types when using this or any other
+ *  stdint.h.
+ */
+
+typedef   int_least8_t   int_fast8_t;
+typedef  uint_least8_t  uint_fast8_t;
+typedef  int_least16_t  int_fast16_t;
+typedef uint_least16_t uint_fast16_t;
+typedef  int_least32_t  int_fast32_t;
+typedef uint_least32_t uint_fast32_t;
+#define  UINT_FAST8_MAX  UINT_LEAST8_MAX
+#define   INT_FAST8_MAX   INT_LEAST8_MAX
+#define UINT_FAST16_MAX UINT_LEAST16_MAX
+#define  INT_FAST16_MAX  INT_LEAST16_MAX
+#define UINT_FAST32_MAX UINT_LEAST32_MAX
+#define  INT_FAST32_MAX  INT_LEAST32_MAX
+#define   INT_FAST8_MIN   INT_LEAST8_MIN
+#define  INT_FAST16_MIN  INT_LEAST16_MIN
+#define  INT_FAST32_MIN  INT_LEAST32_MIN
+#ifdef stdint_int64_defined
+  typedef  int_least64_t  int_fast64_t;
+  typedef uint_least64_t uint_fast64_t;
+# define UINT_FAST64_MAX UINT_LEAST64_MAX
+# define  INT_FAST64_MAX  INT_LEAST64_MAX
+# define  INT_FAST64_MIN  INT_LEAST64_MIN
+#endif
+
+#undef stdint_int64_defined
+
+/*
+ *  Whatever piecemeal, per compiler thing we can do about the wchar_t
+ *  type limits.
+ */
+
+#if defined(__WATCOMC__) || defined(_MSC_VER) || defined (__GNUC__)
+# include <wchar.h>
+# ifndef WCHAR_MIN
+#  define WCHAR_MIN 0
+# endif
+# ifndef WCHAR_MAX
+#  define WCHAR_MAX ((wchar_t)-1)
+# endif
+#endif
+
+/*
+ *  Whatever piecemeal, per compiler/platform thing we can do about the
+ *  (u)intptr_t types and limits.
+ */
+
+#if defined (_MSC_VER) && defined (_UINTPTR_T_DEFINED)
+# define STDINT_H_UINTPTR_T_DEFINED
+#endif
+
+#ifndef STDINT_H_UINTPTR_T_DEFINED
+# if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) || defined (_WIN64)
+#  define stdint_intptr_bits 64
+# elif defined (__WATCOMC__) || defined (__TURBOC__)
+#  if defined(__TINY__) || defined(__SMALL__) || defined(__MEDIUM__)
+#    define stdint_intptr_bits 16
+#  else
+#    define stdint_intptr_bits 32
+#  endif
+# elif defined (__i386__) || defined (_WIN32) || defined (WIN32)
+#  define stdint_intptr_bits 32
+# elif defined (__INTEL_COMPILER)
+/* TODO -- what will Intel do about x86-64? */
+# endif
+
+# ifdef stdint_intptr_bits
+#  define stdint_intptr_glue3_i(a,b,c)  a##b##c
+#  define stdint_intptr_glue3(a,b,c)    stdint_intptr_glue3_i(a,b,c)
+#  ifndef PRINTF_INTPTR_MODIFIER
+#    define PRINTF_INTPTR_MODIFIER      stdint_intptr_glue3(PRINTF_INT,stdint_intptr_bits,_MODIFIER)
+#  endif
+#  ifndef PTRDIFF_MAX
+#    define PTRDIFF_MAX                 stdint_intptr_glue3(INT,stdint_intptr_bits,_MAX)
+#  endif
+#  ifndef PTRDIFF_MIN
+#    define PTRDIFF_MIN                 stdint_intptr_glue3(INT,stdint_intptr_bits,_MIN)
+#  endif
+#  ifndef UINTPTR_MAX
+#    define UINTPTR_MAX                 stdint_intptr_glue3(UINT,stdint_intptr_bits,_MAX)
+#  endif
+#  ifndef INTPTR_MAX
+#    define INTPTR_MAX                  stdint_intptr_glue3(INT,stdint_intptr_bits,_MAX)
+#  endif
+#  ifndef INTPTR_MIN
+#    define INTPTR_MIN                  stdint_intptr_glue3(INT,stdint_intptr_bits,_MIN)
+#  endif
+#  ifndef INTPTR_C
+#    define INTPTR_C(x)                 stdint_intptr_glue3(INT,stdint_intptr_bits,_C)(x)
+#  endif
+#  ifndef UINTPTR_C
+#    define UINTPTR_C(x)                stdint_intptr_glue3(UINT,stdint_intptr_bits,_C)(x)
+#  endif
+  typedef stdint_intptr_glue3(uint,stdint_intptr_bits,_t) uintptr_t;
+  typedef stdint_intptr_glue3( int,stdint_intptr_bits,_t)  intptr_t;
+# else
+/* TODO -- This following is likely wrong for some platforms, and does
+   nothing for the definition of uintptr_t. */
+  typedef ptrdiff_t intptr_t;
+# endif
+# define STDINT_H_UINTPTR_T_DEFINED
+#endif
+
+/*
+ *  Assumes sig_atomic_t is signed and we have a 2s complement machine.
+ */
+
+#ifndef SIG_ATOMIC_MAX
+# define SIG_ATOMIC_MAX ((((sig_atomic_t) 1) << (sizeof (sig_atomic_t)*CHAR_BIT-1)) - 1)
+#endif
+
+#endif
+
+#if defined (__TEST_PSTDINT_FOR_CORRECTNESS)
+
+/* 
+ *  Please compile with the maximum warning settings to make sure macros are not
+ *  defined more than once.
+ */
+ 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+ 
+#define glue3_aux(x,y,z) x ## y ## z
+#define glue3(x,y,z) glue3_aux(x,y,z)
+
+#define DECLU(bits) glue3(uint,bits,_t) glue3(u,bits,=) glue3(UINT,bits,_C) (0);
+#define DECLI(bits) glue3(int,bits,_t) glue3(i,bits,=) glue3(INT,bits,_C) (0);
+
+#define DECL(us,bits) glue3(DECL,us,) (bits)
+
+#define TESTUMAX(bits) glue3(u,bits,=) glue3(~,u,bits); if (glue3(UINT,bits,_MAX) glue3(!=,u,bits)) printf ("Something wrong with UINT%d_MAX\n", bits)
+ 
+int main () {
+	DECL(I,8)
+	DECL(U,8)
+	DECL(I,16)
+	DECL(U,16)
+	DECL(I,32)
+	DECL(U,32)
+#ifdef INT64_MAX
+	DECL(I,64)
+	DECL(U,64)
+#endif
+	intmax_t imax = INTMAX_C(0);
+	uintmax_t umax = UINTMAX_C(0);
+	char str0[256], str1[256];
+
+	sprintf (str0, "%d %x\n", 0, ~0);
+	
+	sprintf (str1, "%d %x\n",  i8, ~0);
+	if (0 != strcmp (str0, str1)) printf ("Something wrong with i8 : %s\n", str1);
+	sprintf (str1, "%u %x\n",  u8, ~0);
+	if (0 != strcmp (str0, str1)) printf ("Something wrong with u8 : %s\n", str1);
+	sprintf (str1, "%d %x\n",  i16, ~0);
+	if (0 != strcmp (str0, str1)) printf ("Something wrong with i16 : %s\n", str1);
+	sprintf (str1, "%u %x\n",  u16, ~0);
+	if (0 != strcmp (str0, str1)) printf ("Something wrong with u16 : %s\n", str1);	
+	sprintf (str1, "%" PRINTF_INT32_MODIFIER "d %x\n",  i32, ~0);
+	if (0 != strcmp (str0, str1)) printf ("Something wrong with i32 : %s\n", str1);
+	sprintf (str1, "%" PRINTF_INT32_MODIFIER "u %x\n",  u32, ~0);
+	if (0 != strcmp (str0, str1)) printf ("Something wrong with u32 : %s\n", str1);
+#ifdef INT64_MAX	
+	sprintf (str1, "%" PRINTF_INT64_MODIFIER "d %x\n",  i64, ~0);
+	if (0 != strcmp (str0, str1)) printf ("Something wrong with i64 : %s\n", str1);
+#endif
+	sprintf (str1, "%" PRINTF_INTMAX_MODIFIER "d %x\n",  imax, ~0);
+	if (0 != strcmp (str0, str1)) printf ("Something wrong with imax : %s\n", str1);
+	sprintf (str1, "%" PRINTF_INTMAX_MODIFIER "u %x\n",  umax, ~0);
+	if (0 != strcmp (str0, str1)) printf ("Something wrong with umax : %s\n", str1);	
+	
+	TESTUMAX(8);
+	TESTUMAX(16);
+	TESTUMAX(32);
+#ifdef INT64_MAX
+	TESTUMAX(64);
+#endif
+
+	return EXIT_SUCCESS;
+}
+
+#endif
diff --git a/utils/MTP/beastpatcher/vs2005/beastpatcher.vcproj b/utils/MTP/beastpatcher/vs2005/beastpatcher.vcproj
index e0473e240a..5d0d204e27 100644
--- a/utils/MTP/beastpatcher/vs2005/beastpatcher.vcproj
+++ b/utils/MTP/beastpatcher/vs2005/beastpatcher.vcproj
@@ -189,6 +189,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\main.c"

+				>

+			</File>

+			<File

 				RelativePath="..\mtp_win32.c"

 				>

 			</File>

@@ -199,6 +203,10 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

 			>

 			<File

+				RelativePath="..\beastpatcher.h"

+				>

+			</File>

+			<File

 				RelativePath="..\bootimg.h"

 				>

 			</File>