From ced1e577b77b5bf0abab7fdcce453fdf0fb249ce Mon Sep 17 00:00:00 2001 From: Earnie Boyd Date: Fri, 14 Jun 2002 13:46:12 +0000 Subject: * include/w32api.h: Change to version 2.0 to reflect the change in the license. * README: Renamed. * README.w32api: Renamed from README. Modified license to remove the restriction of notifying the author based on the fact that the author is unreachable at the notified address. * Makefile.in (VERSION): Change to 2.0. --- winsup/w32api/ChangeLog | 10 +++++ winsup/w32api/Makefile.in | 4 +- winsup/w32api/README | 94 ------------------------------------------ winsup/w32api/README.w32api | 93 +++++++++++++++++++++++++++++++++++++++++ winsup/w32api/include/w32api.h | 6 +-- 5 files changed, 108 insertions(+), 99 deletions(-) delete mode 100644 winsup/w32api/README create mode 100644 winsup/w32api/README.w32api diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index f4d76b51c..d692ef451 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,13 @@ +2002-06-14 Earnie Boyd + + * include/w32api.h: Change to version 2.0 to reflect the change + in the license. + * README: Renamed. + * README.w32api: Renamed from README. Modified license to remove + the restriction of notifying the author based on the fact that the + author is unreachable at the notified address. + * Makefile.in (VERSION): Change to 2.0. + 2002-06-14 Earnie Boyd * include/wingdi.h (GetEnhMetaFileBits): Correct typo. diff --git a/winsup/w32api/Makefile.in b/winsup/w32api/Makefile.in index c6f12e508..003b2bf1c 100644 --- a/winsup/w32api/Makefile.in +++ b/winsup/w32api/Makefile.in @@ -66,11 +66,11 @@ FLAGS_TO_PASS = \ SUBDIRS = lib PACKAGE = w32api -VERSION = 1.5 +VERSION = 2.0 CYGRELEASE = 1 DIST_FILES = Makefile.in configure.in configure config.guess config.sub \ -install-sh README ChangeLog TODO CONTRIBUTIONS +install-sh README.w32api ChangeLog TODO CONTRIBUTIONS all: lib diff --git a/winsup/w32api/README b/winsup/w32api/README deleted file mode 100644 index a34153111..000000000 --- a/winsup/w32api/README +++ /dev/null @@ -1,94 +0,0 @@ - Free headers and libraries for the Win32 API - - Written by Anders Norlander - URL: http://www.acc.umu.se/~anorland/gnu-win32/ - - Maintained by MinGW Developers - Send bug reports and questions to MinGW-users@lists.sourceforge.net - URL: http://www.mingw.org - -* License - - You are free to use, modify and copy this package. No restrictions - are imposed on programs or object files compiled with this library. - - You may not restrict the the usage of this library. - - You may distribute this library as part of another package or as a - modified package if and only if you do *not* restrict the usage of - the portions consisting of this (optionally modified) library. - - If distributed as part of another package, please notify the author - of what you are going to do. If distributed as a modified package, - this file *must* be included. - - This library is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -* What is it? - - This is a free set of headers and import libraries for the Win32 - API. The library differs from the GNU Windows32 library in that I - have tried to use a file structure that mirrors Microsoft's. I - don't like having *all* definitions in one single header as in the - GNU Windows32 library, I want a clean separation between different - parts of the API. - - Daniel Guerrero Miralles contributed the DirectX 6.1 import - libraries and DirectX GUID definitions. - - See the files NOTES and TODO for what needs to be done. - -* Size does matter - - Since the WIN32 API is severely bloated (as most MS products seem to - be) the headers are designed to be as compact as possible, while - still being readable, in order to minimize parsing time. - - The convention is to omit parameter names for function prototypes, - no excessive white space. Struct/union members are indented with tab - characters to make them readable. Comment only when necessary. - - If you are contributing a patch please follow the above mentioned - convention. Make sure your editor does not convert tabs to spaces. - -* What do I need to use it? - - The library is intended for use with egcs 1.1 or later but it is - possible to use with some other tools as well (although it is not - very useful). LCC-Win32, MSVC and Borland C++ 5.01 or higher may - work as well. The import libraries are for GNU tools only. - - The library requires egcs 1.1 or later, since the `#pragma pack' - feature is used. Mumit Khan provides egcs patches and binaries for - win32 at `http://www.xraylith.wisc.edu/~khan/software/gnu-win32/'. - - If you are going to use C++ COM objects, you will need a version of - egcs that recognizes the `comobject' attribute and then define - HAVE_COMOBJECT when compiling your program. Antonio Mendes de - Oliveira Neto has a prebuilt version at - `http://li.facens.br/EGCS-WIN32/english/index.html'. Note that this - is very experimental. If you want to use COM objects in C++ but with - C interfaces you must define CINTERFACE. - - Objective-C programs cannot use COM functionality because of - conflicts between the interface define and the Objective-C - @interface directive. There is also a conflict between the windows - Obj-C BOOL types. To avoid this conflict you should use WINBOOL in - all places where you would use BOOL in a C/C++ windows program. If - you include any windows headers *after* `windows.h' you must use the - method outlined below: - - /* non-windows includes */ - #include - ... - /* windows specific headers */ - #include - #define BOOL WINBOOL - #include - ... - #undef BOOL - ... - /* include other headers */ - diff --git a/winsup/w32api/README.w32api b/winsup/w32api/README.w32api new file mode 100644 index 000000000..02ca26263 --- /dev/null +++ b/winsup/w32api/README.w32api @@ -0,0 +1,93 @@ + Free headers and libraries for the Win32 API + + Originally written by Anders Norlander + Last known and not working email: + + Now maintained by MinGW Developers + Send bug reports and questions to MinGW-users@lists.sourceforge.net + URL: http://www.mingw.org + +* License 2.0 + + You are free to use, modify and copy this package as long as this + README.w32api file is included unmodified with any distribution, source or + binary, of this package. No restrictions are imposed on any package or + product using or incorporating this package. You are free to license your + package as you see fit. + + You may not restrict others freedoms as set forth in the above paragraph. + You may distribute this library as part of another package or as a + modified package if and only if you do *not* restrict others freedoms as + set forth in the above paragraph as it concerns this pakcage. You do have + the right to restrict uses of any package using this package. + + This package is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +* What is it? + + This is a free set of headers and import libraries for the Win32 + API. The library differs from the GNU Windows32 library in that I + have tried to use a file structure that mirrors Microsoft's. I + don't like having *all* definitions in one single header as in the + GNU Windows32 library, I want a clean separation between different + parts of the API. + + Daniel Guerrero Miralles contributed the DirectX 6.1 import + libraries and DirectX GUID definitions. + + See the files NOTES and TODO for what needs to be done. + +* Size does matter + + Since the WIN32 API is severely bloated (as most MS products seem to + be) the headers are designed to be as compact as possible, while + still being readable, in order to minimize parsing time. + + The convention is to omit parameter names for function prototypes, + no excessive white space. Struct/union members are indented with tab + characters to make them readable. Comment only when necessary. + + If you are contributing a patch please follow the above mentioned + convention. Make sure your editor does not convert tabs to spaces. + +* What do I need to use it? + + The library is intended for use with egcs 1.1 or later but it is + possible to use with some other tools as well (although it is not + very useful). LCC-Win32, MSVC and Borland C++ 5.01 or higher may + work as well. The import libraries are for GNU tools only. + + The library requires egcs 1.1 or later, since the `#pragma pack' + feature is used. Mumit Khan provides egcs patches and binaries for + win32 at `http://www.xraylith.wisc.edu/~khan/software/gnu-win32/'. + + If you are going to use C++ COM objects, you will need a version of + egcs that recognizes the `comobject' attribute and then define + HAVE_COMOBJECT when compiling your program. Antonio Mendes de + Oliveira Neto has a prebuilt version at + `http://li.facens.br/EGCS-WIN32/english/index.html'. Note that this + is very experimental. If you want to use COM objects in C++ but with + C interfaces you must define CINTERFACE. + + Objective-C programs cannot use COM functionality because of + conflicts between the interface define and the Objective-C + @interface directive. There is also a conflict between the windows + Obj-C BOOL types. To avoid this conflict you should use WINBOOL in + all places where you would use BOOL in a C/C++ windows program. If + you include any windows headers *after* `windows.h' you must use the + method outlined below: + + /* non-windows includes */ + #include + ... + /* windows specific headers */ + #include + #define BOOL WINBOOL + #include + ... + #undef BOOL + ... + /* include other headers */ + diff --git a/winsup/w32api/include/w32api.h b/winsup/w32api/include/w32api.h index dc0c96c1e..9be737fb7 100644 --- a/winsup/w32api/include/w32api.h +++ b/winsup/w32api/include/w32api.h @@ -4,8 +4,8 @@ #pragma GCC system_header #endif -#define __W32API_VERSION 1.5 -#define __W32API_MAJOR_VERSION 1 -#define __W32API_MINOR_VERSION 5 +#define __W32API_VERSION 2.0 +#define __W32API_MAJOR_VERSION 2 +#define __W32API_MINOR_VERSION 0 #endif /* ndef _W32API_H_ */ -- cgit v1.2.3