-
- Downloads
build: fix circular header inclusion with other packages
This commit renames lib/setup.h to lib/curl_setup.h and renames lib/setup_once.h to lib/curl_setup_once.h. Removes the need and usage of a header inclusion guard foreign to libcurl. [1] Removes the need and presence of an alarming notice we carried in old setup_once.h [2] ---------------------------------------- 1 - lib/setup_once.h used __SETUP_ONCE_H macro as header inclusion guard up to commit ec691ca3 which changed this to HEADER_CURL_SETUP_ONCE_H, this single inclusion guard is enough to ensure that inclusion of lib/setup_once.h done from lib/setup.h is only done once. Additionally lib/setup.h has always used __SETUP_ONCE_H macro to protect inclusion of setup_once.h even after commit ec691ca3, this was to avoid a circular header inclusion triggered when building a c-ares enabled version with c-ares sources available which also has a setup_once.h header. Commit ec691ca3 exposes the real nature of __SETUP_ONCE_H usage in lib/setup.h, it is a header inclusion guard foreign to libcurl belonging to c-ares's setup_once.h The renaming this commit does, fixes the circular header inclusion, and as such removes the need and usage of a header inclusion guard foreign to libcurl. Macro __SETUP_ONCE_H no longer used in libcurl. 2 - Due to the circular interdependency of old lib/setup_once.h and the c-ares setup_once.h header, old file lib/setup_once.h has carried back from 2006 up to now days an alarming and prominent notice about the need of keeping libcurl's and c-ares's setup_once.h in sync. Given that this commit fixes the circular interdependency, the need and presence of mentioned notice is removed. All mentioned interdependencies come back from now old days when the c-ares project lived inside a curl subdirectory. This commit removes last traces of such fact.
Showing
- docs/INSTALL 1 addition, 1 deletiondocs/INSTALL
- docs/examples/Makefile.am 1 addition, 1 deletiondocs/examples/Makefile.am
- include/curl/curlrules.h 1 addition, 1 deletioninclude/curl/curlrules.h
- lib/Makefile.am 2 additions, 2 deletionslib/Makefile.am
- lib/Makefile.inc 3 additions, 3 deletionslib/Makefile.inc
- lib/README.hostip 1 addition, 1 deletionlib/README.hostip
- lib/amigaos.c 1 addition, 1 deletionlib/amigaos.c
- lib/amigaos.h 1 addition, 1 deletionlib/amigaos.h
- lib/asyn-ares.c 1 addition, 1 deletionlib/asyn-ares.c
- lib/asyn-thread.c 1 addition, 1 deletionlib/asyn-thread.c
- lib/asyn.h 1 addition, 1 deletionlib/asyn.h
- lib/axtls.c 1 addition, 1 deletionlib/axtls.c
- lib/base64.c 1 addition, 1 deletionlib/base64.c
- lib/bundles.c 1 addition, 1 deletionlib/bundles.c
- lib/conncache.c 1 addition, 1 deletionlib/conncache.c
- lib/connect.c 1 addition, 1 deletionlib/connect.c
- lib/connect.h 1 addition, 1 deletionlib/connect.h
- lib/content_encoding.c 1 addition, 1 deletionlib/content_encoding.c
- lib/content_encoding.h 1 addition, 1 deletionlib/content_encoding.h
- lib/cookie.c 1 addition, 1 deletionlib/cookie.c
Loading
Please register or sign in to comment