Skip to content

Commit f9f9277

Browse files
slime73slime73
committed
Move NSURL backend from 'macos' folder to 'apple' folder.
It's not macOS-specific (it should work on iOS too)
1 parent b7d19d0 commit f9f9277

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

‎src/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ add_library (https-schannel STATIC EXCLUDE_FROM_ALL
3939
)
4040

4141
add_library (https-nsurl STATIC EXCLUDE_FROM_ALL
42-
macos/NSURLClient.mm
42+
apple/NSURLClient.mm
4343
)
4444

4545
add_library (https-android STATIC EXCLUDE_FROM_ALL
@@ -51,31 +51,31 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
5151
option (USE_CURL_BACKEND "Use the libcurl backend" ON)
5252
option (USE_OPENSSL_BACKEND "Use the openssl backend" ON)
5353
option (USE_SCHANNEL_BACKEND "Use the schannel backend (windows-only)" OFF)
54-
option (USE_NSURL_BACKEND "Use the NSUrl backend (macos-only)" OFF)
54+
option (USE_NSURL_BACKEND "Use the NSUrl backend (apple-only)" OFF)
5555
option (USE_ANDROID_BACKEND "Use the Android Java backend (Android-only)" OFF)
5656

5757
option (USE_WINSOCK "Use winsock instead of BSD sockets (windows-only)" OFF)
5858
elseif (WIN32)
5959
option (USE_CURL_BACKEND "Use the libcurl backend" OFF)
6060
option (USE_OPENSSL_BACKEND "Use the openssl backend" OFF)
6161
option (USE_SCHANNEL_BACKEND "Use the schannel backend (windows-only)" ON)
62-
option (USE_NSURL_BACKEND "Use the NSUrl backend (macos-only)" OFF)
62+
option (USE_NSURL_BACKEND "Use the NSUrl backend (apple-only)" OFF)
6363
option (USE_ANDROID_BACKEND "Use the Android Java backend (Android-only)" OFF)
6464

6565
option (USE_WINSOCK "Use winsock instead of BSD sockets (windows-only)" ON)
6666
elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
6767
option (USE_CURL_BACKEND "Use the libcurl backend" OFF)
6868
option (USE_OPENSSL_BACKEND "Use the openssl backend" OFF)
6969
option (USE_SCHANNEL_BACKEND "Use the schannel backend (windows-only)" OFF)
70-
option (USE_NSURL_BACKEND "Use the NSUrl backend (macos-only)" ON)
70+
option (USE_NSURL_BACKEND "Use the NSUrl backend (apple-only)" ON)
7171
option (USE_ANDROID_BACKEND "Use the Android Java backend (Android-only)" OFF)
7272

7373
option (USE_WINSOCK "Use winsock instead of BSD sockets (windows-only)" OFF)
7474
elseif (ANDROID)
7575
option (USE_CURL_BACKEND "Use the libcurl backend" OFF)
7676
option (USE_OPENSSL_BACKEND "Use the openssl backend" OFF)
7777
option (USE_SCHANNEL_BACKEND "Use the schannel backend (windows-only)" OFF)
78-
option (USE_NSURL_BACKEND "Use the NSUrl backend (macos-only)" OFF)
78+
option (USE_NSURL_BACKEND "Use the NSUrl backend (apple-only)" OFF)
7979
option (USE_ANDROID_BACKEND "Use the Android Java backend (Android-only)" ON)
8080

8181
option (USE_WINSOCK "Use winsock instead of BSD sockets (windows-only)" OFF)

src/macos/NSURLClient.h renamed to src/apple/NSURLClient.h

File renamed without changes.

src/macos/NSURLClient.mm renamed to src/apple/NSURLClient.mm

File renamed without changes.

‎src/common/HTTPS.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# include "../windows/SChannelConnection.h"
1515
#endif
1616
#ifdef HTTPS_BACKEND_NSURL
17-
# include "../macos/NSURLClient.h"
17+
# include "../apple/NSURLClient.h"
1818
#endif
1919
#ifdef HTTPS_BACKEND_ANDROID
2020
# include "../android/AndroidClient.h"

0 commit comments

Comments
 (0)