Package 0.44-1-mingw32 fixes

diff --git a/ChangeLog b/ChangeLog
index d96bf6a..9224ad1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
+2009-09-15  Charles Wilson  <cwilso11@users.sourceforge.net>
+
+       Package 0.44-1-mingw32 fixes.
+       * pexports.c (main): Fix typo in usage statement.
+       * pexports.h: Ensure ULONGLONG is defined.
+       * Makefile: Force use of flex and bison, not lex and yacc.
+
 2008-08-31  Tor Lillqvist  <tml@novell.com>
 
+       Release 0.44. Add support for 64-bit executables.
        * hlex.l
        * hparse.y
        * pexports.h
@@ -13,6 +21,7 @@
        * Makefile: New.
        * pe.h: Not needed, removed.
        * hparse.h: Remove generated file.
+       * Makefile.am: Removed.
 
 2002-11-08  Luke Dunstan  <infidel@users.sourceforge.net>
 

diff --git a/Makefile b/Makefile
index 80428cc..f67a1db 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,6 @@
 CC=gcc -Wall
+LEX=flex
+YACC=bison
 
 DISTFILES=README COPYING ChangeLog Makefile hlex.l hparse.y pexports.h pexports.c str_tree.c str_tree.h
 

diff --git a/pexports.c b/pexports.c
index ee937ca..1c3a6f6 100644 (file)
--- a/pexports.c
+++ b/pexports.c
@@ -146,7 +146,7 @@ main(int argc, char *argv[])
              "This program is free software; you may redistribute it under the terms of\n"
              "the GNU General Public License.  This program has absolutely no warranty.\n"
 
-             "\nUsage: %s [-v] [-n] [-h header] [-p preprocessor] dll\n"
+             "\nUsage: %s [-v] [-o] [-h header] [-p preprocessor] dll\n"
              "  -h\tparse header\n"
              "  -o\tprint ordinals\n"
              "  -p\tset preprocessor program\n"

diff --git a/pexports.h b/pexports.h
index 0a9abde..4563a44 100644 (file)
--- a/pexports.h
+++ b/pexports.h
@@ -26,7 +26,11 @@ typedef unsigned int DWORD;
 typedef unsigned char BYTE;
 typedef void* PVOID;
 typedef long LONG;
+#if defined(__MINGW32__) || defined(_MSC_VER)
 typedef unsigned __int64 ULONGLONG;
+#else
+typedef unsigned long long ULONGLONG;
+#endif
 typedef int BOOL;
 typedef void* HMODULE;
 #ifdef _WIN64