[ros-diffs] [cfinck] 75985: [HEADERS] Use the new header with SPDX license identifier for host headers I've contributed to and ensure license compliance for pshpack/poppack. - The pshpack and poppack headers w...

Author: cfinck
Date: Fri Sep 29 10:10:26 2017
New Revision: 75985

URL: http://svn.reactos.org/svn/reactos?rev=75985&view=rev
Log:
[HEADERS] Use the new header with SPDX license identifier for host headers I've
contributed to and ensure license compliance for pshpack/poppack.

- The pshpack and poppack headers were rewritten from scratch as their current versions
came with no license information and included obsolete checks (e.g. for an ancient FreeBSD
version).
  I have put the new ones under CC0-1.0, which is equivalent to Public Domain but legally
valid also in jurisdictions which have no concept of Public Domain (e.g. Germany).
- Relicense nls.h under CC0-1.0 too. I'd recommend the same for typedefs.h, but
I'm not the only contributor to that file.

Modified:
    trunk/reactos/sdk/include/host/nls.h
    trunk/reactos/sdk/include/host/poppack.h
    trunk/reactos/sdk/include/host/pshpack1.h
    trunk/reactos/sdk/include/host/pshpack2.h
    trunk/reactos/sdk/include/host/pshpack4.h
    trunk/reactos/sdk/include/host/pshpack8.h
    trunk/reactos/sdk/include/host/pshpck16.h
    trunk/reactos/sdk/include/host/typedefs.h
    trunk/reactos/sdk/include/psdk/poppack.h
    trunk/reactos/sdk/include/psdk/pshpack1.h
    trunk/reactos/sdk/include/psdk/pshpack2.h
    trunk/reactos/sdk/include/psdk/pshpack4.h
    trunk/reactos/sdk/include/psdk/pshpack8.h
    trunk/reactos/sdk/include/psdk/pshpck16.h

Modified: trunk/reactos/sdk/include/host/nls.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/host/nls.h?rev…
==============================================================================
--- trunk/reactos/sdk/include/host/nls.h	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/host/nls.h	[iso-8859-1] Fri Sep 29 10:10:26 2017
@@ -1,10 +1,9 @@
 /*
-  PROJECT:    ReactOS
-  LICENSE:    GPL v2 or any later version
-  FILE:       include/host/nls.h
-  PURPOSE:    NLS definitions for host tools
-  COPYRIGHT:  Copyright 2007 Colin Finck <mail(a)colinfinck.de>
-*/
+ * PROJECT:     ReactOS Host Headers
+ * LICENSE:     CC0-1.0 (https://spdx.org/licenses/CC0-1.0)
+ * PURPOSE:     NLS definitions for host tools
+ * COPYRIGHT:   Copyright 2007-2017 Colin Finck (colin(a)reactos.org)
+ */
 
 #ifndef _HOST_NLS_H
 #define _HOST_NLS_H

Modified: trunk/reactos/sdk/include/host/poppack.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/host/poppack.h…
==============================================================================
--- trunk/reactos/sdk/include/host/poppack.h	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/host/poppack.h	[iso-8859-1] Fri Sep 29 10:10:26 2017
@@ -1,10 +1,10 @@
-#ifndef RC_INVOKED
-#if ( _MSC_VER >= 800 )
-#pragma warning(disable:4103)
-#endif // _MSC_VER
-# if ( __FreeBSD__ == 5 )
-#  pragma pack(4)
-# else
-#  pragma pack(pop)
-# endif // __FreeBSD__
-#endif // RC_INVOKED
+/*
+ * PROJECT:     ReactOS Host Headers
+ * LICENSE:     CC0-1.0 (https://spdx.org/licenses/CC0-1.0)
+ * PURPOSE:     Restores structure packing alignment
+ * COPYRIGHT:   Copyright 2017 Colin Finck (colin(a)reactos.org)
+ */
+
+#if !defined(RC_INVOKED)
+#pragma pack(pop)
+#endif

Modified: trunk/reactos/sdk/include/host/pshpack1.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/host/pshpack1.…
==============================================================================
--- trunk/reactos/sdk/include/host/pshpack1.h	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/host/pshpack1.h	[iso-8859-1] Fri Sep 29 10:10:26 2017
@@ -1,10 +1,15 @@
-#ifndef RC_INVOKED
-#if ( _MSC_VER >= 800 )
-#pragma warning(disable:4103)
-#endif // _MSC_VER
-# if ( __FreeBSD__ == 5 )
-#  pragma pack(1)
-# else
-#  pragma pack(push,1)
-# endif // __FreeBSD__
-#endif // RC_INVOKED
+/*
+ * PROJECT:     ReactOS Host Headers
+ * LICENSE:     CC0-1.0 (https://spdx.org/licenses/CC0-1.0)
+ * PURPOSE:     Sets structure packing alignment to 1 byte
+ * COPYRIGHT:   Copyright 2017 Colin Finck (colin(a)reactos.org)
+ */
+
+#if !defined(RC_INVOKED)
+
+#if defined(_MSC_VER)
+#pragma warning(disable: 4103)
+#endif
+
+#pragma pack(push, 1)
+#endif

Modified: trunk/reactos/sdk/include/host/pshpack2.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/host/pshpack2.…
==============================================================================
--- trunk/reactos/sdk/include/host/pshpack2.h	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/host/pshpack2.h	[iso-8859-1] Fri Sep 29 10:10:26 2017
@@ -1,10 +1,15 @@
-#ifndef RC_INVOKED
-#if ( _MSC_VER >= 800 )
-#pragma warning(disable:4103)
-#endif // _MSC_VER
-# if ( __FreeBSD__ == 5 )
-#  pragma pack(2)
-# else
-#  pragma pack(push,2)
-# endif // __FreeBSD__
-#endif // RC_INVOKED
+/*
+ * PROJECT:     ReactOS Host Headers
+ * LICENSE:     CC0-1.0 (https://spdx.org/licenses/CC0-1.0)
+ * PURPOSE:     Sets structure packing alignment to 2 bytes
+ * COPYRIGHT:   Copyright 2017 Colin Finck (colin(a)reactos.org)
+ */
+
+#if !defined(RC_INVOKED)
+
+#if defined(_MSC_VER)
+#pragma warning(disable: 4103)
+#endif
+
+#pragma pack(push, 2)
+#endif

Modified: trunk/reactos/sdk/include/host/pshpack4.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/host/pshpack4.…
==============================================================================
--- trunk/reactos/sdk/include/host/pshpack4.h	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/host/pshpack4.h	[iso-8859-1] Fri Sep 29 10:10:26 2017
@@ -1,10 +1,15 @@
-#ifndef RC_INVOKED
-#if ( _MSC_VER >= 800 )
-#pragma warning(disable:4103)
-#endif // _MSC_VER
-# if ( __FreeBSD__ == 5 )
-#  pragma pack(4)
-# else
-#  pragma pack(push,4)
-# endif // __FreeBSD__
-#endif // RC_INVOKED
+/*
+ * PROJECT:     ReactOS Host Headers
+ * LICENSE:     CC0-1.0 (https://spdx.org/licenses/CC0-1.0)
+ * PURPOSE:     Sets structure packing alignment to 4 bytes
+ * COPYRIGHT:   Copyright 2017 Colin Finck (colin(a)reactos.org)
+ */
+
+#if !defined(RC_INVOKED)
+
+#if defined(_MSC_VER)
+#pragma warning(disable: 4103)
+#endif
+
+#pragma pack(push, 4)
+#endif

Modified: trunk/reactos/sdk/include/host/pshpack8.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/host/pshpack8.…
==============================================================================
--- trunk/reactos/sdk/include/host/pshpack8.h	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/host/pshpack8.h	[iso-8859-1] Fri Sep 29 10:10:26 2017
@@ -1,10 +1,15 @@
-#ifndef RC_INVOKED
-#if ( _MSC_VER >= 800 )
-#pragma warning(disable:4103)
-#endif // _MSC_VER
-# if ( __FreeBSD__ == 5 )
-#  pragma pack(8)
-# else
-#  pragma pack(push,8)
-# endif // __FreeBSD__
-#endif // RC_INVOKED
+/*
+ * PROJECT:     ReactOS Host Headers
+ * LICENSE:     CC0-1.0 (https://spdx.org/licenses/CC0-1.0)
+ * PURPOSE:     Sets structure packing alignment to 8 bytes
+ * COPYRIGHT:   Copyright 2017 Colin Finck (colin(a)reactos.org)
+ */
+
+#if !defined(RC_INVOKED)
+
+#if defined(_MSC_VER)
+#pragma warning(disable: 4103)
+#endif
+
+#pragma pack(push, 8)
+#endif

Modified: trunk/reactos/sdk/include/host/pshpck16.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/host/pshpck16.…
==============================================================================
--- trunk/reactos/sdk/include/host/pshpck16.h	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/host/pshpck16.h	[iso-8859-1] Fri Sep 29 10:10:26 2017
@@ -1,10 +1,15 @@
-#ifndef RC_INVOKED
-#if ( _MSC_VER >= 800 )
-#pragma warning(disable:4103)
-#endif // _MSC_VER
-# if ( __FreeBSD__ == 5 )
-#  pragma pack(16)
-# else
-#  pragma pack(push,16)
-# endif // __FreeBSD__
-#endif // RC_INVOKED
+/*
+ * PROJECT:     ReactOS Host Headers
+ * LICENSE:     CC0-1.0 (https://spdx.org/licenses/CC0-1.0)
+ * PURPOSE:     Sets structure packing alignment to 16 bytes
+ * COPYRIGHT:   Copyright 2017 Colin Finck (colin(a)reactos.org)
+ */
+
+#if !defined(RC_INVOKED)
+
+#if defined(_MSC_VER)
+#pragma warning(disable: 4103)
+#endif
+
+#pragma pack(push, 16)
+#endif

Modified: trunk/reactos/sdk/include/host/typedefs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/host/typedefs.…
==============================================================================
--- trunk/reactos/sdk/include/host/typedefs.h	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/host/typedefs.h	[iso-8859-1] Fri Sep 29 10:10:26 2017
@@ -1,11 +1,10 @@
 /*
-  PROJECT:    ReactOS
-  LICENSE:    GPL v2 or any later version
-  FILE:       include/host/typedefs.h
-  PURPOSE:    Type definitions and useful macros for host tools
-  COPYRIGHT:  Copyright 2007 Hervé Poussineau
-              Copyright 2007 Colin Finck <mail(a)colinfinck.de>
-*/
+ * PROJECT:     ReactOS Host Headers
+ * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE:     Type definitions and useful macros for host tools
+ * COPYRIGHT:   Copyright 2007 Hervé Poussineau (hpoussin(a)reactos.org)
+ *              Copyright 2007 Colin Finck (colin(a)reactos.org)
+ */
 
 #ifndef _TYPEDEFS_HOST_H
 #define _TYPEDEFS_HOST_H

Modified: trunk/reactos/sdk/include/psdk/poppack.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/poppack.h…
==============================================================================
--- trunk/reactos/sdk/include/psdk/poppack.h	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/psdk/poppack.h	[iso-8859-1] Fri Sep 29 10:10:26 2017
@@ -1,10 +1,10 @@
-#ifndef RC_INVOKED
-#if ( _MSC_VER >= 800 )
-#pragma warning(disable:4103)
-#endif // _MSC_VER
-# if defined(__FreeBSD__) && ( __FreeBSD__ == 5 )
-#  pragma pack(4)
-# else
-#  pragma pack(pop)
-# endif // __FreeBSD__
-#endif // RC_INVOKED
+/*
+ * PROJECT:     ReactOS PSDK Headers
+ * LICENSE:     CC0-1.0 (https://spdx.org/licenses/CC0-1.0)
+ * PURPOSE:     Restores structure packing alignment
+ * COPYRIGHT:   Copyright 2017 Colin Finck (colin(a)reactos.org)
+ */
+
+#if !defined(RC_INVOKED)
+#pragma pack(pop)
+#endif

Modified: trunk/reactos/sdk/include/psdk/pshpack1.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/pshpack1.…
==============================================================================
--- trunk/reactos/sdk/include/psdk/pshpack1.h	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/psdk/pshpack1.h	[iso-8859-1] Fri Sep 29 10:10:26 2017
@@ -1,10 +1,15 @@
-#ifndef RC_INVOKED
-#if ( _MSC_VER >= 800 )
-#pragma warning(disable:4103)
-#endif // _MSC_VER
-# if defined(__FreeBSD__) && ( __FreeBSD__ == 5 )
-#  pragma pack(1)
-# else
-#  pragma pack(push,1)
-# endif // __FreeBSD__
-#endif // RC_INVOKED
+/*
+ * PROJECT:     ReactOS PSDK Headers
+ * LICENSE:     CC0-1.0 (https://spdx.org/licenses/CC0-1.0)
+ * PURPOSE:     Sets structure packing alignment to 1 byte
+ * COPYRIGHT:   Copyright 2017 Colin Finck (colin(a)reactos.org)
+ */
+
+#if !defined(RC_INVOKED)
+
+#if defined(_MSC_VER)
+#pragma warning(disable: 4103)
+#endif
+
+#pragma pack(push, 1)
+#endif

Modified: trunk/reactos/sdk/include/psdk/pshpack2.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/pshpack2.…
==============================================================================
--- trunk/reactos/sdk/include/psdk/pshpack2.h	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/psdk/pshpack2.h	[iso-8859-1] Fri Sep 29 10:10:26 2017
@@ -1,10 +1,15 @@
-#ifndef RC_INVOKED
-#if ( _MSC_VER >= 800 )
-#pragma warning(disable:4103)
-#endif // _MSC_VER
-# if defined(__FreeBSD__) && ( __FreeBSD__ == 5 )
-#  pragma pack(2)
-# else
-#  pragma pack(push,2)
-# endif // __FreeBSD__
-#endif // RC_INVOKED
+/*
+ * PROJECT:     ReactOS PSDK Headers
+ * LICENSE:     CC0-1.0 (https://spdx.org/licenses/CC0-1.0)
+ * PURPOSE:     Sets structure packing alignment to 2 bytes
+ * COPYRIGHT:   Copyright 2017 Colin Finck (colin(a)reactos.org)
+ */
+
+#if !defined(RC_INVOKED)
+
+#if defined(_MSC_VER)
+#pragma warning(disable: 4103)
+#endif
+
+#pragma pack(push, 2)
+#endif

Modified: trunk/reactos/sdk/include/psdk/pshpack4.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/pshpack4.…
==============================================================================
--- trunk/reactos/sdk/include/psdk/pshpack4.h	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/psdk/pshpack4.h	[iso-8859-1] Fri Sep 29 10:10:26 2017
@@ -1,10 +1,15 @@
-#ifndef RC_INVOKED
-#if ( _MSC_VER >= 800 )
-#pragma warning(disable:4103)
-#endif // _MSC_VER
-# if defined(__FreeBSD__) && ( __FreeBSD__ == 5 )
-#  pragma pack(4)
-# else
-#  pragma pack(push,4)
-# endif // __FreeBSD__
-#endif // RC_INVOKED
+/*
+ * PROJECT:     ReactOS PSDK Headers
+ * LICENSE:     CC0-1.0 (https://spdx.org/licenses/CC0-1.0)
+ * PURPOSE:     Sets structure packing alignment to 4 bytes
+ * COPYRIGHT:   Copyright 2017 Colin Finck (colin(a)reactos.org)
+ */
+
+#if !defined(RC_INVOKED)
+
+#if defined(_MSC_VER)
+#pragma warning(disable: 4103)
+#endif
+
+#pragma pack(push, 4)
+#endif

Modified: trunk/reactos/sdk/include/psdk/pshpack8.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/pshpack8.…
==============================================================================
--- trunk/reactos/sdk/include/psdk/pshpack8.h	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/psdk/pshpack8.h	[iso-8859-1] Fri Sep 29 10:10:26 2017
@@ -1,10 +1,15 @@
-#ifndef RC_INVOKED
-#if ( _MSC_VER >= 800 )
-#pragma warning(disable:4103)
-#endif // _MSC_VER
-# if defined(__FreeBSD__) && ( __FreeBSD__ == 5 )
-#  pragma pack(8)
-# else
-#  pragma pack(push,8)
-# endif // __FreeBSD__
-#endif // RC_INVOKED
+/*
+ * PROJECT:     ReactOS PSDK Headers
+ * LICENSE:     CC0-1.0 (https://spdx.org/licenses/CC0-1.0)
+ * PURPOSE:     Sets structure packing alignment to 8 bytes
+ * COPYRIGHT:   Copyright 2017 Colin Finck (colin(a)reactos.org)
+ */
+
+#if !defined(RC_INVOKED)
+
+#if defined(_MSC_VER)
+#pragma warning(disable: 4103)
+#endif
+
+#pragma pack(push, 8)
+#endif

Modified: trunk/reactos/sdk/include/psdk/pshpck16.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/pshpck16.…
==============================================================================
--- trunk/reactos/sdk/include/psdk/pshpck16.h	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/psdk/pshpck16.h	[iso-8859-1] Fri Sep 29 10:10:26 2017
@@ -1,10 +1,15 @@
-#ifndef RC_INVOKED
-#if ( _MSC_VER >= 800 )
-#pragma warning(disable:4103)
-#endif // _MSC_VER
-# if defined(__FreeBSD__) && ( __FreeBSD__ == 5 )
-#  pragma pack(16)
-# else
-#  pragma pack(push,16)
-# endif // __FreeBSD__
-#endif // RC_INVOKED
+/*
+ * PROJECT:     ReactOS PSDK Headers
+ * LICENSE:     CC0-1.0 (https://spdx.org/licenses/CC0-1.0)
+ * PURPOSE:     Sets structure packing alignment to 16 bytes
+ * COPYRIGHT:   Copyright 2017 Colin Finck (colin(a)reactos.org)
+ */
+
+#if !defined(RC_INVOKED)
+
+#if defined(_MSC_VER)
+#pragma warning(disable: 4103)
+#endif
+
+#pragma pack(push, 16)
+#endif