Moved the unix version to lib/isc/unix/include/isc so it's more obvious in the future...

diff --git a/lib/isc/include/isc/Makefile.in b/lib/isc/include/isc/Makefile.in
index 513f9923abd4f0f73e7ece861e37b2e9e5718efb..9577e4bd9e5e9458f70f7979f4abcaabc64a88a6 100644 (file)
--- a/lib/isc/include/isc/Makefile.in
+++ b/lib/isc/include/isc/Makefile.in
@@ -32,7 +32,7 @@ HEADERS =     aes.h app.h assertions.h atomic.h backtrace.h \
                radix.h random.h ratelimiter.h refcount.h regex.h \
                region.h resource.h result.h resultclass.h rwlock.h \
                safe.h serial.h sockaddr.h socket.h \
-               stats.h stdatomic.h stdio.h strerr.h string.h symtab.h \
+               stats.h stdio.h strerr.h string.h symtab.h \
                task.h taskpool.h timer.h tm.h types.h util.h version.h \
                xml.h
 

diff --git a/lib/isc/unix/include/isc/Makefile.in b/lib/isc/unix/include/isc/Makefile.in
index 001115c4d2730813149b980af410eafa5a41aae9..2e3d3b7f5ea6db79a69dd45c2297eee15ee0e89a 100644 (file)
--- a/lib/isc/unix/include/isc/Makefile.in
+++ b/lib/isc/unix/include/isc/Makefile.in
@@ -14,7 +14,7 @@ top_srcdir =  @top_srcdir@
 VERSION=@BIND9_VERSION@
 
 HEADERS =      dir.h net.h netdb.h offset.h stat.h \
-               stdtime.h syslog.h time.h
+               stdatomic.h stdtime.h syslog.h time.h
 
 SUBDIRS =
 TARGETS =

diff --git a/lib/isc/include/isc/stdatomic.h b/lib/isc/unix/include/isc/stdatomic.h
similarity index 100%
rename from lib/isc/include/isc/stdatomic.h
rename to lib/isc/unix/include/isc/stdatomic.h

diff --git a/util/copyrights b/util/copyrights
index 937302251a0dd9623b97c5143e72ddf6507c34a5..19abd79c54a7a63ea1bb583c9d5a4011edd4a86b 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -2242,7 +2242,6 @@
 ./lib/isc/include/isc/sockaddr.h               C       1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2009,2012,2015,2016,2018,2019
 ./lib/isc/include/isc/socket.h                 C       1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2016,2018,2019
 ./lib/isc/include/isc/stats.h                  C       2009,2012,2016,2018,2019
-./lib/isc/include/isc/stdatomic.h              C       2018,2019
 ./lib/isc/include/isc/stdio.h                  C       2000,2001,2004,2005,2006,2007,2013,2016,2018,2019
 ./lib/isc/include/isc/strerr.h                 C       2018,2019
 ./lib/isc/include/isc/string.h                 C       2000,2001,2003,2004,2005,2006,2007,2014,2016,2018,2019
@@ -2356,6 +2355,7 @@
 ./lib/isc/unix/include/isc/netdb.h             C       1999,2000,2001,2004,2005,2007,2016,2018,2019
 ./lib/isc/unix/include/isc/offset.h            C       2000,2001,2004,2005,2007,2008,2016,2018,2019
 ./lib/isc/unix/include/isc/stat.h              C       2004,2007,2014,2016,2018,2019
+./lib/isc/unix/include/isc/stdatomic.h         C       2019
 ./lib/isc/unix/include/isc/stdtime.h           C       1999,2000,2001,2004,2005,2007,2011,2012,2016,2018,2019
 ./lib/isc/unix/include/isc/syslog.h            C       1999,2000,2001,2004,2005,2007,2016,2018,2019
 ./lib/isc/unix/include/isc/time.h              C       1998,1999,2000,2001,2004,2005,2006,2007,2008,2009,2012,2014,2015,2016,2017,2018,2019