Slightly modify the public domain license to keep it in the public domain, but make it clear that even when dedications might not be recognized that the code is still usable. Given that this isn't dual-licensing under a different license, I'm hoping this will be acceptable.

2016-02-10 14:48:59 -08:00 · 2016-02-10 14:48:59 -08:00 · 49b65c0873
parent 955dfe991b
commit 49b65c0873
20 changed files with 40 additions and 40 deletions
--- a/docs/stb_howto.txt
+++ b/docs/stb_howto.txt
@ -165,8 +165,8 @@ public domain declarations aren't necessary recognized
 in the USA and some other locations. For that reason,
 I recommend a declaration along these lines:

-// This software is in the public domain. Where that dedication is not
-// recognized, you are granted a perpetual, irrevocable license to copy
+// This software is dual-licensed to the public domain and under the following
+// license. You are granted a perpetual, irrevocable license to copy
 // and modify this file as you see fit.

 I typically place this declaration at the end of the initial
--- a/docs/why_public_domain.md
+++ b/docs/why_public_domain.md
@ -95,8 +95,8 @@ public domain declarations aren't necessary recognized
 in the USA and some other locations. For that reason,
 I recommend a declaration along these lines:

-// This software is in the public domain. Where that dedication is not
-// recognized, you are granted a perpetual, irrevocable license to copy
+// This software is dual-licensed to the public domain and under the following
+// license. You are granted a perpetual, irrevocable license to copy
 // and modify this file as you see fit.

 I typically place this declaration at the end of the initial
--- a/stb.h
+++ b/stb.h
@ -171,8 +171,8 @@ Parenthesized items have since been removed.

 LICENSE

-This software is in the public domain. Where that dedication is not
-recognized, you are granted a perpetual, irrevocable license to copy,
+This software is dual-licensed to the public domain and under the following
+license. You are granted a perpetual, irrevocable license to copy,
 distribute, and modify this file as you see fit.

 CREDITS
--- a/stb_c_lexer.h
+++ b/stb_c_lexer.h
@ -32,8 +32,8 @@
 //
 // LICENSE
 //
-//   This software is in the public domain. Where that dedication is not
-//   recognized, you are granted a perpetual, irrevocable license to copy,
+//   This software is dual-licensed to the public domain and under the following
+//   license. You are granted a perpetual, irrevocable license to copy,
 //   distribute, and modify this file as you see fit.

 #ifndef STB_C_LEXER_DEFINITIONS
--- a/stb_divide.h
+++ b/stb_divide.h
@ -78,8 +78,8 @@
 //
 // LICENSE
 //
-//   This software is in the public domain. Where that dedication is not
-//   recognized, you are granted a perpetual, irrevocable license to copy,
+//   This software is dual-licensed to the public domain and under the following
+//   license. You are granted a perpetual, irrevocable license to copy,
 //   distribute, and modify this file as you see fit.


--- a/stb_dxt.h
+++ b/stb_dxt.h
@ -19,8 +19,8 @@
 //
 // LICENSE
 //
-//   This software is in the public domain. Where that dedication is not
-//   recognized, you are granted a perpetual, irrevocable license to copy,
+//   This software is dual-licensed to the public domain and under the following
+//   license. You are granted a perpetual, irrevocable license to copy,
 //   distribute, and modify this file as you see fit.

 #ifndef STB_INCLUDE_STB_DXT_H
--- a/stb_easy_font.h
+++ b/stb_easy_font.h
@ -67,8 +67,8 @@
 //
 // LICENSE
 //
-//   This software is in the public domain. Where that dedication is not
-//   recognized, you are granted a perpetual, irrevocable license to copy,
+//   This software is dual-licensed to the public domain and under the following
+//   license. You are granted a perpetual, irrevocable license to copy,
 //   distribute, and modify this file as you see fit.
 //
 // VERSION HISTORY
--- a/stb_herringbone_wang_tile.h
+++ b/stb_herringbone_wang_tile.h
@ -3,8 +3,8 @@

 == LICENSE ==============================

-This software is in the public domain. Where that dedication is not
-recognized, you are granted a perpetual, irrevocable license to copy,
+This software is dual-licensed to the public domain and under the following
+license. You are granted a perpetual, irrevocable license to copy,
 distribute, and modify this file as you see fit.

 == WHAT IT IS ===========================
--- a/stb_image.h
+++ b/stb_image.h
@ -209,8 +209,8 @@

 LICENSE

-This software is in the public domain. Where that dedication is not
-recognized, you are granted a perpetual, irrevocable license to copy,
+This software is dual-licensed to the public domain and under the following
+license. You are granted a perpetual, irrevocable license to copy,
 distribute, and modify this file as you see fit.

 */
--- a/stb_image_resize.h
+++ b/stb_image_resize.h
@ -160,8 +160,8 @@

   LICENSE

-     This software is in the public domain. Where that dedication is not
-     recognized, you are granted a perpetual, irrevocable license to copy,
+     This software is dual-licensed to the public domain and under the following
+     license. You are granted a perpetual, irrevocable license to copy,
     distribute, and modify this file as you see fit.

   TODO
--- a/stb_image_write.h
+++ b/stb_image_write.h
@ -105,8 +105,8 @@ CREDITS:
      
 LICENSE

-This software is in the public domain. Where that dedication is not
-recognized, you are granted a perpetual, irrevocable license to copy,
+This software is dual-licensed to the public domain and under the following
+license. You are granted a perpetual, irrevocable license to copy,
 distribute, and modify this file as you see fit.

 */
--- a/stb_leakcheck.h
+++ b/stb_leakcheck.h
@ -1,8 +1,8 @@
 // stb_leakcheck.h - v0.2 - quick & dirty malloc leak-checking - public domain
 // LICENSE
 //
-//   This software is in the public domain. Where that dedication is not
-//   recognized, you are granted a perpetual, irrevocable license to copy,
+//   This software is dual-licensed to the public domain and under the following
+//   license. You are granted a perpetual, irrevocable license to copy,
 //   distribute, and modify this file as you see fit.

 #ifdef STB_LEAKCHECK_IMPLEMENTATION
--- a/stb_perlin.h
+++ b/stb_perlin.h
@ -3,8 +3,8 @@
 //
 // LICENSE
 //
-//   This software is in the public domain. Where that dedication is not
-//   recognized, you are granted a perpetual, irrevocable license to copy,
+//   This software is dual-licensed to the public domain and under the following
+//   license. You are granted a perpetual, irrevocable license to copy,
 //   distribute, and modify this file as you see fit.
 //
 //
--- a/stb_rect_pack.h
+++ b/stb_rect_pack.h
@ -41,8 +41,8 @@
 //
 // LICENSE
 //
-//   This software is in the public domain. Where that dedication is not
-//   recognized, you are granted a perpetual, irrevocable license to copy,
+//   This software is dual-licensed to the public domain and under the following
+//   license. You are granted a perpetual, irrevocable license to copy,
 //   distribute, and modify this file as you see fit.

 //////////////////////////////////////////////////////////////////////////////
--- a/stb_textedit.h
+++ b/stb_textedit.h
@ -17,8 +17,8 @@
 //
 // LICENSE
 //
-//   This software is in the public domain. Where that dedication is not
-//   recognized, you are granted a perpetual, irrevocable license to copy,
+//   This software is dual-licensed to the public domain and under the following
+//   license. You are granted a perpetual, irrevocable license to copy,
 //   distribute, and modify this file as you see fit.
 //
 //
--- a/stb_tilemap_editor.h
+++ b/stb_tilemap_editor.h
@ -316,8 +316,8 @@
 //
 // LICENSE
 //
-//   This software is in the public domain. Where that dedication is not
-//   recognized, you are granted a perpetual, irrevocable license to copy,
+//   This software is dual-licensed to the public domain and under the following
+//   license. You are granted a perpetual, irrevocable license to copy,
 //   distribute, and modify this file as you see fit.


--- a/stb_truetype.h
+++ b/stb_truetype.h
@ -68,8 +68,8 @@
 //
 // LICENSE
 //
-//   This software is in the public domain. Where that dedication is not
-//   recognized, you are granted a perpetual, irrevocable license to copy,
+//   This software is dual-licensed to the public domain and under the following
+//   license. You are granted a perpetual, irrevocable license to copy,
 //   distribute, and modify this file as you see fit.
 //
 // USAGE
--- a/stb_vorbis.c
+++ b/stb_vorbis.c
@ -9,8 +9,8 @@
 //
 // LICENSE
 //
-//   This software is in the public domain. Where that dedication is not
-//   recognized, you are granted a perpetual, irrevocable license to copy,
+//   This software is dual-licensed to the public domain and under the following
+//   license. You are granted a perpetual, irrevocable license to copy,
 //   distribute, and modify this file as you see fit.
 //
 // No warranty for any purpose is expressed or implied by the author (nor
--- a/stb_voxel_render.h
+++ b/stb_voxel_render.h
@ -215,8 +215,8 @@
 //
 // LICENSE
 //
-//   This software is in the public domain. Where that dedication is not
-//   recognized, you are granted a perpetual, irrevocable license to copy,
+//   This software is dual-licensed to the public domain and under the following
+//   license. You are granted a perpetual, irrevocable license to copy,
 //   distribute, and modify this file as you see fit.

 #ifndef INCLUDE_STB_VOXEL_RENDER_H
--- a/stretchy_buffer.h
+++ b/stretchy_buffer.h
@ -164,8 +164,8 @@
 //
 // LICENSE
 //
-//   This software is in the public domain. Where that dedication is not
-//   recognized, you are granted a perpetual, irrevocable license to copy,
+//   This software is dual-licensed to the public domain and under the following
+//   license. You are granted a perpetual, irrevocable license to copy,
 //   distribute, and modify this file as you see fit.

 #ifndef STB_STRETCHY_BUFFER_H_INCLUDED