capacitor-freerasp 2.2.2 → 2.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (118) hide show
  1. package/CHANGELOG.md +57 -0
  2. package/CapacitorFreerasp.podspec +1 -1
  3. package/README.md +8 -8
  4. package/android/build.gradle +1 -1
  5. package/android/src/main/java/com/aheaditec/freerasp/FreeraspPlugin.kt +39 -18
  6. package/android/src/main/java/com/aheaditec/freerasp/ScreenProtector.kt +24 -2
  7. package/android/src/main/java/com/aheaditec/freerasp/ThreatHandler.kt +36 -18
  8. package/android/src/main/java/com/aheaditec/freerasp/events/BaseRaspEvent.kt +7 -0
  9. package/android/src/main/java/com/aheaditec/freerasp/events/RaspExecutionStateEvent.kt +22 -0
  10. package/android/src/main/java/com/aheaditec/freerasp/events/ThreatEvent.kt +69 -0
  11. package/android/src/main/java/com/aheaditec/freerasp/models/CapSuspiciousAppInfo.kt +1 -0
  12. package/android/src/main/java/com/aheaditec/freerasp/utils/Extensions.kt +1 -0
  13. package/android/src/main/java/com/aheaditec/freerasp/utils/RandomGenerator.kt +24 -0
  14. package/android/src/main/java/com/aheaditec/freerasp/utils/Utils.kt +3 -5
  15. package/dist/esm/api/listeners/raspExecutionState.d.ts +2 -0
  16. package/dist/esm/api/listeners/raspExecutionState.js +23 -0
  17. package/dist/esm/api/listeners/raspExecutionState.js.map +1 -0
  18. package/dist/esm/api/listeners/threat.d.ts +2 -0
  19. package/dist/esm/api/listeners/threat.js +84 -0
  20. package/dist/esm/api/listeners/threat.js.map +1 -0
  21. package/dist/esm/api/methods/capacitor.d.ts +4 -0
  22. package/dist/esm/api/methods/capacitor.js +11 -0
  23. package/dist/esm/api/methods/capacitor.js.map +1 -0
  24. package/dist/esm/api/methods/native.d.ts +6 -0
  25. package/dist/esm/api/methods/native.js +32 -0
  26. package/dist/esm/api/methods/native.js.map +1 -0
  27. package/dist/esm/api/nativeModules.d.ts +2 -0
  28. package/dist/esm/api/nativeModules.js +3 -0
  29. package/dist/esm/api/nativeModules.js.map +1 -0
  30. package/dist/esm/channels/raspExecutionState.d.ts +3 -0
  31. package/dist/esm/channels/raspExecutionState.js +27 -0
  32. package/dist/esm/channels/raspExecutionState.js.map +1 -0
  33. package/dist/esm/channels/threat.d.ts +3 -0
  34. package/dist/esm/channels/threat.js +34 -0
  35. package/dist/esm/channels/threat.js.map +1 -0
  36. package/dist/esm/index.d.ts +7 -12
  37. package/dist/esm/index.js +7 -158
  38. package/dist/esm/index.js.map +1 -1
  39. package/dist/esm/models/raspExecutionState.d.ts +6 -0
  40. package/dist/esm/models/raspExecutionState.js +10 -0
  41. package/dist/esm/models/raspExecutionState.js.map +1 -0
  42. package/dist/esm/models/threat.d.ts +26 -0
  43. package/dist/esm/{definitions.js → models/threat.js} +7 -3
  44. package/dist/esm/models/threat.js.map +1 -0
  45. package/dist/esm/{definitions.d.ts → types/types.d.ts} +37 -44
  46. package/dist/esm/types/types.js +2 -0
  47. package/dist/esm/types/types.js.map +1 -0
  48. package/dist/esm/utils/malware.d.ts +3 -0
  49. package/dist/esm/utils/malware.js +22 -0
  50. package/dist/esm/utils/malware.js.map +1 -0
  51. package/dist/esm/utils/utils.d.ts +3 -0
  52. package/dist/esm/utils/utils.js +12 -0
  53. package/dist/esm/utils/utils.js.map +1 -0
  54. package/dist/plugin.cjs.js +153 -78
  55. package/dist/plugin.cjs.js.map +1 -1
  56. package/dist/plugin.js +153 -78
  57. package/dist/plugin.js.map +1 -1
  58. package/ios/Plugin/FreeraspPlugin.m +2 -0
  59. package/ios/Plugin/FreeraspPlugin.swift +50 -75
  60. package/ios/Plugin/Info.plist +1 -1
  61. package/ios/Plugin/TalsecRuntime.xcframework/_CodeSignature/CodeDirectory +0 -0
  62. package/ios/Plugin/TalsecRuntime.xcframework/_CodeSignature/CodeResources +100 -298
  63. package/ios/Plugin/TalsecRuntime.xcframework/_CodeSignature/CodeSignature +0 -0
  64. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64/TalsecRuntime.framework/Headers/CurlWrapper.h +1 -1
  65. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64/TalsecRuntime.framework/Headers/TalsecRuntime-Swift.h +7 -2
  66. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64/TalsecRuntime.framework/Headers/curl.h +380 -281
  67. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64/TalsecRuntime.framework/Headers/curlver.h +5 -6
  68. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64/TalsecRuntime.framework/Headers/easy.h +4 -4
  69. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64/TalsecRuntime.framework/Headers/header.h +1 -1
  70. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64/TalsecRuntime.framework/Headers/mprintf.h +11 -4
  71. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64/TalsecRuntime.framework/Headers/multi.h +62 -22
  72. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64/TalsecRuntime.framework/Headers/options.h +2 -2
  73. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64/TalsecRuntime.framework/Headers/system.h +76 -164
  74. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64/TalsecRuntime.framework/Headers/typecheck-gcc.h +947 -0
  75. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64/TalsecRuntime.framework/Headers/urlapi.h +5 -4
  76. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64/TalsecRuntime.framework/Headers/websockets.h +17 -3
  77. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64/TalsecRuntime.framework/Info.plist +0 -0
  78. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64/TalsecRuntime.framework/Modules/TalsecRuntime.swiftmodule/arm64-apple-ios.abi.json +233 -528
  79. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64/TalsecRuntime.framework/Modules/TalsecRuntime.swiftmodule/arm64-apple-ios.private.swiftinterface +7 -3
  80. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64/TalsecRuntime.framework/Modules/TalsecRuntime.swiftmodule/arm64-apple-ios.swiftdoc +0 -0
  81. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64/TalsecRuntime.framework/Modules/TalsecRuntime.swiftmodule/arm64-apple-ios.swiftinterface +7 -3
  82. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64/TalsecRuntime.framework/TalsecRuntime +0 -0
  83. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/Headers/CurlWrapper.h +1 -1
  84. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/Headers/TalsecRuntime-Swift.h +14 -4
  85. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/Headers/curl.h +380 -281
  86. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/Headers/curlver.h +5 -6
  87. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/Headers/easy.h +4 -4
  88. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/Headers/header.h +1 -1
  89. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/Headers/mprintf.h +11 -4
  90. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/Headers/multi.h +62 -22
  91. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/Headers/options.h +2 -2
  92. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/Headers/system.h +76 -164
  93. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/Headers/typecheck-gcc.h +947 -0
  94. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/Headers/urlapi.h +5 -4
  95. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/Headers/websockets.h +17 -3
  96. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/Info.plist +0 -0
  97. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/Modules/TalsecRuntime.swiftmodule/arm64-apple-ios-simulator.abi.json +233 -528
  98. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/Modules/TalsecRuntime.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface +7 -3
  99. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/Modules/TalsecRuntime.swiftmodule/arm64-apple-ios-simulator.swiftdoc +0 -0
  100. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/Modules/TalsecRuntime.swiftmodule/arm64-apple-ios-simulator.swiftinterface +7 -3
  101. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/Modules/TalsecRuntime.swiftmodule/x86_64-apple-ios-simulator.abi.json +233 -528
  102. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/Modules/TalsecRuntime.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface +7 -3
  103. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/Modules/TalsecRuntime.swiftmodule/x86_64-apple-ios-simulator.swiftdoc +0 -0
  104. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/Modules/TalsecRuntime.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +7 -3
  105. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/TalsecRuntime +0 -0
  106. package/ios/Plugin/TalsecRuntime.xcframework/ios-arm64_x86_64-simulator/TalsecRuntime.framework/_CodeSignature/CodeResources +56 -45
  107. package/ios/Plugin/models/RaspExecutionStates.swift +15 -0
  108. package/ios/Plugin/models/SecurityThreat.swift +40 -0
  109. package/ios/Plugin/utils/EventIdentifiers.swift +17 -0
  110. package/ios/Plugin/utils/RandomGenerator.swift +23 -0
  111. package/ios/Plugin/utils/Utils.swift +32 -0
  112. package/package.json +15 -10
  113. package/android/src/main/java/com/aheaditec/freerasp/Threat.kt +0 -58
  114. package/dist/esm/definitions.js.map +0 -1
  115. package/dist/esm/utils.d.ts +0 -2
  116. package/dist/esm/utils.js +0 -8
  117. package/dist/esm/utils.js.map +0 -1
  118. package/ios/Plugin/TalsecRuntime.xcframework/_CodeSignature/CodeRequirements-1 +0 -0
@@ -31,83 +31,42 @@
31
31
  * changed.
32
32
  *
33
33
  * In order to differentiate between platforms/compilers/architectures use
34
- * only compiler built in predefined preprocessor symbols.
34
+ * only compiler built-in predefined preprocessor symbols.
35
35
  *
36
36
  * curl_off_t
37
37
  * ----------
38
38
  *
39
- * For any given platform/compiler curl_off_t must be typedef'ed to a 64-bit
39
+ * For any given platform/compiler curl_off_t MUST be typedef'ed to a 64-bit
40
40
  * wide signed integral data type. The width of this data type must remain
41
41
  * constant and independent of any possible large file support settings.
42
42
  *
43
- * As an exception to the above, curl_off_t shall be typedef'ed to a 32-bit
44
- * wide signed integral data type if there is no 64-bit type.
45
- *
46
43
  * As a general rule, curl_off_t shall not be mapped to off_t. This rule shall
47
44
  * only be violated if off_t is the only 64-bit data type available and the
48
45
  * size of off_t is independent of large file support settings. Keep your
49
- * build on the safe side avoiding an off_t gating. If you have a 64-bit
46
+ * build on the safe side avoiding an off_t gating. If you have a 64-bit
50
47
  * off_t then take for sure that another 64-bit data type exists, dig deeper
51
48
  * and you will find it.
52
49
  *
53
50
  */
54
51
 
55
- #if defined(__DJGPP__) || defined(__GO32__)
56
- # if defined(__DJGPP__) && (__DJGPP__ > 1)
57
- # define CURL_TYPEOF_CURL_OFF_T long long
58
- # define CURL_FORMAT_CURL_OFF_T "lld"
59
- # define CURL_FORMAT_CURL_OFF_TU "llu"
60
- # define CURL_SUFFIX_CURL_OFF_T LL
61
- # define CURL_SUFFIX_CURL_OFF_TU ULL
62
- # else
63
- # define CURL_TYPEOF_CURL_OFF_T long
64
- # define CURL_FORMAT_CURL_OFF_T "ld"
65
- # define CURL_FORMAT_CURL_OFF_TU "lu"
66
- # define CURL_SUFFIX_CURL_OFF_T L
67
- # define CURL_SUFFIX_CURL_OFF_TU UL
68
- # endif
69
- # define CURL_TYPEOF_CURL_SOCKLEN_T int
70
-
71
- #elif defined(__SALFORDC__)
72
- # define CURL_TYPEOF_CURL_OFF_T long
73
- # define CURL_FORMAT_CURL_OFF_T "ld"
74
- # define CURL_FORMAT_CURL_OFF_TU "lu"
75
- # define CURL_SUFFIX_CURL_OFF_T L
76
- # define CURL_SUFFIX_CURL_OFF_TU UL
52
+ #ifdef __DJGPP__
53
+ # define CURL_TYPEOF_CURL_OFF_T long long
54
+ # define CURL_FORMAT_CURL_OFF_T "lld"
55
+ # define CURL_FORMAT_CURL_OFF_TU "llu"
56
+ # define CURL_SUFFIX_CURL_OFF_T LL
57
+ # define CURL_SUFFIX_CURL_OFF_TU ULL
77
58
  # define CURL_TYPEOF_CURL_SOCKLEN_T int
78
59
 
79
60
  #elif defined(__BORLANDC__)
80
- # if (__BORLANDC__ < 0x520)
81
- # define CURL_TYPEOF_CURL_OFF_T long
82
- # define CURL_FORMAT_CURL_OFF_T "ld"
83
- # define CURL_FORMAT_CURL_OFF_TU "lu"
84
- # define CURL_SUFFIX_CURL_OFF_T L
85
- # define CURL_SUFFIX_CURL_OFF_TU UL
86
- # else
87
- # define CURL_TYPEOF_CURL_OFF_T __int64
88
- # define CURL_FORMAT_CURL_OFF_T "I64d"
89
- # define CURL_FORMAT_CURL_OFF_TU "I64u"
90
- # define CURL_SUFFIX_CURL_OFF_T i64
91
- # define CURL_SUFFIX_CURL_OFF_TU ui64
92
- # endif
93
- # define CURL_TYPEOF_CURL_SOCKLEN_T int
94
-
95
- #elif defined(__TURBOC__)
96
- # define CURL_TYPEOF_CURL_OFF_T long
97
- # define CURL_FORMAT_CURL_OFF_T "ld"
98
- # define CURL_FORMAT_CURL_OFF_TU "lu"
99
- # define CURL_SUFFIX_CURL_OFF_T L
100
- # define CURL_SUFFIX_CURL_OFF_TU UL
61
+ # define CURL_TYPEOF_CURL_OFF_T __int64
62
+ # define CURL_FORMAT_CURL_OFF_T "I64d"
63
+ # define CURL_FORMAT_CURL_OFF_TU "I64u"
64
+ # define CURL_SUFFIX_CURL_OFF_T i64
65
+ # define CURL_SUFFIX_CURL_OFF_TU ui64
101
66
  # define CURL_TYPEOF_CURL_SOCKLEN_T int
102
67
 
103
68
  #elif defined(__POCC__)
104
- # if (__POCC__ < 280)
105
- # define CURL_TYPEOF_CURL_OFF_T long
106
- # define CURL_FORMAT_CURL_OFF_T "ld"
107
- # define CURL_FORMAT_CURL_OFF_TU "lu"
108
- # define CURL_SUFFIX_CURL_OFF_T L
109
- # define CURL_SUFFIX_CURL_OFF_TU UL
110
- # elif defined(_MSC_VER)
69
+ # ifdef _MSC_VER
111
70
  # define CURL_TYPEOF_CURL_OFF_T __int64
112
71
  # define CURL_FORMAT_CURL_OFF_T "I64d"
113
72
  # define CURL_FORMAT_CURL_OFF_TU "I64u"
@@ -123,7 +82,7 @@
123
82
  # define CURL_TYPEOF_CURL_SOCKLEN_T int
124
83
 
125
84
  #elif defined(__LCC__)
126
- # if defined(__MCST__) /* MCST eLbrus Compiler Collection */
85
+ # ifdef __MCST__ /* MCST eLbrus Compiler Collection */
127
86
  # define CURL_TYPEOF_CURL_OFF_T long
128
87
  # define CURL_FORMAT_CURL_OFF_T "ld"
129
88
  # define CURL_FORMAT_CURL_OFF_TU "lu"
@@ -159,23 +118,38 @@
159
118
  # define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int
160
119
 
161
120
  #elif defined(__TANDEM)
162
- # if ! defined(__LP64)
163
- /* Required for 32-bit NonStop builds only. */
164
- # define CURL_TYPEOF_CURL_OFF_T long long
165
- # define CURL_FORMAT_CURL_OFF_T "lld"
166
- # define CURL_FORMAT_CURL_OFF_TU "llu"
167
- # define CURL_SUFFIX_CURL_OFF_T LL
168
- # define CURL_SUFFIX_CURL_OFF_TU ULL
169
- # define CURL_TYPEOF_CURL_SOCKLEN_T int
170
- # endif
121
+ # ifndef __LP64
122
+ # define CURL_TYPEOF_CURL_OFF_T long long
123
+ # define CURL_FORMAT_CURL_OFF_T "lld"
124
+ # define CURL_FORMAT_CURL_OFF_TU "llu"
125
+ # define CURL_SUFFIX_CURL_OFF_T LL
126
+ # define CURL_SUFFIX_CURL_OFF_TU ULL
127
+ # define CURL_TYPEOF_CURL_SOCKLEN_T int
128
+ # else
129
+ # define CURL_TYPEOF_CURL_OFF_T long
130
+ # define CURL_FORMAT_CURL_OFF_T "ld"
131
+ # define CURL_FORMAT_CURL_OFF_TU "lu"
132
+ # define CURL_SUFFIX_CURL_OFF_T L
133
+ # define CURL_SUFFIX_CURL_OFF_TU UL
134
+ # define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int
135
+ # endif
171
136
 
172
- #elif defined(_WIN32_WCE)
173
- # define CURL_TYPEOF_CURL_OFF_T __int64
174
- # define CURL_FORMAT_CURL_OFF_T "I64d"
175
- # define CURL_FORMAT_CURL_OFF_TU "I64u"
176
- # define CURL_SUFFIX_CURL_OFF_T i64
177
- # define CURL_SUFFIX_CURL_OFF_TU ui64
178
- # define CURL_TYPEOF_CURL_SOCKLEN_T int
137
+ #elif defined(UNDER_CE)
138
+ # ifdef __MINGW32CE__
139
+ # define CURL_TYPEOF_CURL_OFF_T long long
140
+ # define CURL_FORMAT_CURL_OFF_T "lld"
141
+ # define CURL_FORMAT_CURL_OFF_TU "llu"
142
+ # define CURL_SUFFIX_CURL_OFF_T LL
143
+ # define CURL_SUFFIX_CURL_OFF_TU ULL
144
+ # define CURL_TYPEOF_CURL_SOCKLEN_T int
145
+ # else
146
+ # define CURL_TYPEOF_CURL_OFF_T __int64
147
+ # define CURL_FORMAT_CURL_OFF_T "I64d"
148
+ # define CURL_FORMAT_CURL_OFF_TU "I64u"
149
+ # define CURL_SUFFIX_CURL_OFF_T i64
150
+ # define CURL_SUFFIX_CURL_OFF_TU ui64
151
+ # define CURL_TYPEOF_CURL_SOCKLEN_T int
152
+ # endif
179
153
 
180
154
  #elif defined(__MINGW32__)
181
155
  # include <inttypes.h>
@@ -188,7 +162,7 @@
188
162
  # define CURL_PULL_SYS_TYPES_H 1
189
163
 
190
164
  #elif defined(__VMS)
191
- # if defined(__VAX)
165
+ # ifdef __VAX
192
166
  # define CURL_TYPEOF_CURL_OFF_T long
193
167
  # define CURL_FORMAT_CURL_OFF_T "ld"
194
168
  # define CURL_FORMAT_CURL_OFF_TU "lu"
@@ -214,19 +188,13 @@
214
188
  # define CURL_PULL_SYS_SOCKET_H 1
215
189
 
216
190
  #elif defined(__MVS__)
217
- # if defined(_LONG_LONG)
191
+ # ifdef _LONG_LONG
218
192
  # define CURL_TYPEOF_CURL_OFF_T long long
219
193
  # define CURL_FORMAT_CURL_OFF_T "lld"
220
194
  # define CURL_FORMAT_CURL_OFF_TU "llu"
221
195
  # define CURL_SUFFIX_CURL_OFF_T LL
222
196
  # define CURL_SUFFIX_CURL_OFF_TU ULL
223
- # elif defined(_LP64)
224
- # define CURL_TYPEOF_CURL_OFF_T long
225
- # define CURL_FORMAT_CURL_OFF_T "ld"
226
- # define CURL_FORMAT_CURL_OFF_TU "lu"
227
- # define CURL_SUFFIX_CURL_OFF_T L
228
- # define CURL_SUFFIX_CURL_OFF_TU UL
229
- # else
197
+ # else /* _LP64 and default */
230
198
  # define CURL_TYPEOF_CURL_OFF_T long
231
199
  # define CURL_FORMAT_CURL_OFF_T "ld"
232
200
  # define CURL_FORMAT_CURL_OFF_TU "lu"
@@ -239,22 +207,13 @@
239
207
 
240
208
  #elif defined(__370__)
241
209
  # if defined(__IBMC__) || defined(__IBMCPP__)
242
- # if defined(_ILP32)
243
- # elif defined(_LP64)
244
- # endif
245
- # if defined(_LONG_LONG)
210
+ # ifdef _LONG_LONG
246
211
  # define CURL_TYPEOF_CURL_OFF_T long long
247
212
  # define CURL_FORMAT_CURL_OFF_T "lld"
248
213
  # define CURL_FORMAT_CURL_OFF_TU "llu"
249
214
  # define CURL_SUFFIX_CURL_OFF_T LL
250
215
  # define CURL_SUFFIX_CURL_OFF_TU ULL
251
- # elif defined(_LP64)
252
- # define CURL_TYPEOF_CURL_OFF_T long
253
- # define CURL_FORMAT_CURL_OFF_T "ld"
254
- # define CURL_FORMAT_CURL_OFF_TU "lu"
255
- # define CURL_SUFFIX_CURL_OFF_T L
256
- # define CURL_SUFFIX_CURL_OFF_TU UL
257
- # else
216
+ # else /* _LP64 and default */
258
217
  # define CURL_TYPEOF_CURL_OFF_T long
259
218
  # define CURL_FORMAT_CURL_OFF_T "ld"
260
219
  # define CURL_FORMAT_CURL_OFF_TU "lu"
@@ -307,7 +266,7 @@
307
266
  # define CURL_PULL_SYS_SOCKET_H 1
308
267
 
309
268
  #elif defined(__xlc__) /* IBM xlc compiler */
310
- # if !defined(_LP64)
269
+ # ifndef _LP64
311
270
  # define CURL_TYPEOF_CURL_OFF_T long long
312
271
  # define CURL_FORMAT_CURL_OFF_T "lld"
313
272
  # define CURL_FORMAT_CURL_OFF_TU "llu"
@@ -325,7 +284,7 @@
325
284
  # define CURL_PULL_SYS_SOCKET_H 1
326
285
 
327
286
  #elif defined(__hpux) /* HP aCC compiler */
328
- # if !defined(_LP64)
287
+ # ifndef _LP64
329
288
  # define CURL_TYPEOF_CURL_OFF_T long long
330
289
  # define CURL_FORMAT_CURL_OFF_T "lld"
331
290
  # define CURL_FORMAT_CURL_OFF_TU "llu"
@@ -349,24 +308,15 @@
349
308
  #elif defined(_MSC_VER)
350
309
  # if (_MSC_VER >= 1800)
351
310
  # include <inttypes.h>
352
- # define CURL_TYPEOF_CURL_OFF_T __int64
353
311
  # define CURL_FORMAT_CURL_OFF_T PRId64
354
312
  # define CURL_FORMAT_CURL_OFF_TU PRIu64
355
- # define CURL_SUFFIX_CURL_OFF_T i64
356
- # define CURL_SUFFIX_CURL_OFF_TU ui64
357
- # elif (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64)
358
- # define CURL_TYPEOF_CURL_OFF_T __int64
313
+ # else
359
314
  # define CURL_FORMAT_CURL_OFF_T "I64d"
360
315
  # define CURL_FORMAT_CURL_OFF_TU "I64u"
361
- # define CURL_SUFFIX_CURL_OFF_T i64
362
- # define CURL_SUFFIX_CURL_OFF_TU ui64
363
- # else
364
- # define CURL_TYPEOF_CURL_OFF_T long
365
- # define CURL_FORMAT_CURL_OFF_T "ld"
366
- # define CURL_FORMAT_CURL_OFF_TU "lu"
367
- # define CURL_SUFFIX_CURL_OFF_T L
368
- # define CURL_SUFFIX_CURL_OFF_TU UL
369
316
  # endif
317
+ # define CURL_TYPEOF_CURL_OFF_T __int64
318
+ # define CURL_SUFFIX_CURL_OFF_T i64
319
+ # define CURL_SUFFIX_CURL_OFF_TU ui64
370
320
  # define CURL_TYPEOF_CURL_SOCKLEN_T int
371
321
 
372
322
  /* ===================================== */
@@ -379,13 +329,18 @@
379
329
  defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || \
380
330
  defined(__sparc__) || defined(__mips__) || defined(__sh__) || \
381
331
  defined(__XTENSA__) || \
382
- (defined(__SIZEOF_LONG__) && __SIZEOF_LONG__ == 4) || \
332
+ (defined(__SIZEOF_LONG__) && __SIZEOF_LONG__ == 4) || \
383
333
  (defined(__LONG_MAX__) && __LONG_MAX__ == 2147483647L))
384
334
  # define CURL_TYPEOF_CURL_OFF_T long long
385
335
  # define CURL_FORMAT_CURL_OFF_T "lld"
386
336
  # define CURL_FORMAT_CURL_OFF_TU "llu"
387
337
  # define CURL_SUFFIX_CURL_OFF_T LL
388
338
  # define CURL_SUFFIX_CURL_OFF_TU ULL
339
+ # if (__GNUC__ >= 4) || \
340
+ ((__GNUC__ == 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 4))
341
+ # define CURL_POPCOUNT64(x) __builtin_popcountll(x)
342
+ # define CURL_CTZ64(x) __builtin_ctzll(x)
343
+ # endif
389
344
  # elif defined(__LP64__) || \
390
345
  defined(__x86_64__) || defined(__ppc64__) || defined(__sparc64__) || \
391
346
  defined(__e2k__) || \
@@ -396,19 +351,24 @@
396
351
  # define CURL_FORMAT_CURL_OFF_TU "lu"
397
352
  # define CURL_SUFFIX_CURL_OFF_T L
398
353
  # define CURL_SUFFIX_CURL_OFF_TU UL
354
+ # if (__GNUC__ >= 4) || \
355
+ ((__GNUC__ == 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 4))
356
+ # define CURL_POPCOUNT64(x) __builtin_popcountl(x)
357
+ # define CURL_CTZ64(x) __builtin_ctzl(x)
358
+ # endif
399
359
  # endif
400
360
  # define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
401
361
  # define CURL_PULL_SYS_TYPES_H 1
402
362
  # define CURL_PULL_SYS_SOCKET_H 1
403
363
 
404
364
  #else
405
- /* generic "safe guess" on old 32 bit style */
406
- # define CURL_TYPEOF_CURL_OFF_T long
407
- # define CURL_FORMAT_CURL_OFF_T "ld"
408
- # define CURL_FORMAT_CURL_OFF_TU "lu"
409
- # define CURL_SUFFIX_CURL_OFF_T L
410
- # define CURL_SUFFIX_CURL_OFF_TU UL
411
- # define CURL_TYPEOF_CURL_SOCKLEN_T int
365
+ /* generic "safe guess" on old 32-bit style */
366
+ # define CURL_TYPEOF_CURL_OFF_T long long
367
+ # define CURL_FORMAT_CURL_OFF_T "lld"
368
+ # define CURL_FORMAT_CURL_OFF_TU "llu"
369
+ # define CURL_SUFFIX_CURL_OFF_T LL
370
+ # define CURL_SUFFIX_CURL_OFF_TU ULL
371
+ # define CURL_TYPEOF_CURL_SOCKLEN_T int
412
372
  #endif
413
373
 
414
374
  #ifdef _AIX
@@ -445,52 +405,4 @@
445
405
  typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
446
406
  #endif
447
407
 
448
- /*
449
- * CURL_ISOCPP and CURL_OFF_T_C definitions are done here in order to allow
450
- * these to be visible and exported by the external libcurl interface API,
451
- * while also making them visible to the library internals, simply including
452
- * curl_setup.h, without actually needing to include curl.h internally.
453
- * If some day this section would grow big enough, all this should be moved
454
- * to its own header file.
455
- */
456
-
457
- /*
458
- * Figure out if we can use the ## preprocessor operator, which is supported
459
- * by ISO/ANSI C and C++. Some compilers support it without setting __STDC__
460
- * or __cplusplus so we need to carefully check for them too.
461
- */
462
-
463
- #if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) || \
464
- defined(__HP_aCC) || defined(__BORLANDC__) || defined(__LCC__) || \
465
- defined(__POCC__) || defined(__SALFORDC__) || defined(__HIGHC__) || \
466
- defined(__ILEC400__)
467
- /* This compiler is believed to have an ISO compatible preprocessor */
468
- #define CURL_ISOCPP
469
- #else
470
- /* This compiler is believed NOT to have an ISO compatible preprocessor */
471
- #undef CURL_ISOCPP
472
- #endif
473
-
474
- /*
475
- * Macros for minimum-width signed and unsigned curl_off_t integer constants.
476
- */
477
-
478
- #if defined(__BORLANDC__) && (__BORLANDC__ == 0x0551)
479
- # define CURLINC_OFF_T_C_HLPR2(x) x
480
- # define CURLINC_OFF_T_C_HLPR1(x) CURLINC_OFF_T_C_HLPR2(x)
481
- # define CURL_OFF_T_C(Val) CURLINC_OFF_T_C_HLPR1(Val) ## \
482
- CURLINC_OFF_T_C_HLPR1(CURL_SUFFIX_CURL_OFF_T)
483
- # define CURL_OFF_TU_C(Val) CURLINC_OFF_T_C_HLPR1(Val) ## \
484
- CURLINC_OFF_T_C_HLPR1(CURL_SUFFIX_CURL_OFF_TU)
485
- #else
486
- # ifdef CURL_ISOCPP
487
- # define CURLINC_OFF_T_C_HLPR2(Val,Suffix) Val ## Suffix
488
- # else
489
- # define CURLINC_OFF_T_C_HLPR2(Val,Suffix) Val/**/Suffix
490
- # endif
491
- # define CURLINC_OFF_T_C_HLPR1(Val,Suffix) CURLINC_OFF_T_C_HLPR2(Val,Suffix)
492
- # define CURL_OFF_T_C(Val) CURLINC_OFF_T_C_HLPR1(Val,CURL_SUFFIX_CURL_OFF_T)
493
- # define CURL_OFF_TU_C(Val) CURLINC_OFF_T_C_HLPR1(Val,CURL_SUFFIX_CURL_OFF_TU)
494
- #endif
495
-
496
408
  #endif /* CURLINC_SYSTEM_H */