Refactored WinPR includes

winpr/CMakeLists.txt

@@ -243,13 +243,6 @@ set(OPENSSL_FEATURE_TYPE "RECOMMENDED")
         message(FATAL_ERROR "OpenSSL or MBedTLS are required, none enabled/found")
     endif()
 
-	# Include directories
-	include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
-
-	# Configure files
-	add_definitions("-DHAVE_CONFIG_H")
-	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-
 	enable_testing()
 
 	if(MSVC)
@@ -288,7 +281,8 @@ endif()
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
 
-add_subdirectory(include)
+set(WINPR_INCLUDE_DIR "include/winpr${WINPR_VERSION_MAJOR}")
+
 
 add_subdirectory(libwinpr)
 
@@ -300,6 +294,8 @@ if(BUILD_TESTING)
 	add_subdirectory(test)
 endif()
 
+add_subdirectory(include)
+
 install_freerdp_man(wlog.7 7)
 # Exporting
 
@@ -307,8 +303,6 @@ export(PACKAGE winpr)
 
 SetFreeRDPCMakeInstallDir(WINPR_CMAKE_INSTALL_DIR "WinPR${WINPR_VERSION_MAJOR}")
 
-set(WINPR_INCLUDE_DIR "include/winpr${WINPR_VERSION_MAJOR}")
-
 configure_package_config_file(WinPRConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/WinPRConfig.cmake
 	INSTALL_DESTINATION ${WINPR_CMAKE_INSTALL_DIR}
 	PATH_VARS WINPR_INCLUDE_DIR)
@@ -323,4 +317,4 @@ install(EXPORT WinPRTargets DESTINATION ${WINPR_CMAKE_INSTALL_DIR})
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr.pc.in ${CMAKE_CURRENT_BINARY_DIR}/winpr${WINPR_VERSION_MAJOR}.pc @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/winpr${WINPR_VERSION_MAJOR}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/buildflags.h.in ${CMAKE_CURRENT_BINARY_DIR}/buildflags.h)
+

winpr/include/CMakeLists.txt

@@ -15,14 +15,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/version.h)
+configure_file(config/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/version.h)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr/wtypes.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/wtypes.h)
+configure_file(config/wtypes.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/wtypes.h)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr/build-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/build-config.h)
+configure_file(config/build-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/build-config.h)
-set(WINPR_INSTALL_INCLUDE_DIR include/winpr${WINPR_VERSION_MAJOR}/winpr)
+configure_file(config/buildflags.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/buildflags.h)
+configure_file(config/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/config.h)
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
+	DESTINATION ${WINPR_INCLUDE_DIR}
+        FILES_MATCHING PATTERN "*.h")
+
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/
+	DESTINATION ${WINPR_INCLUDE_DIR}
+        FILES_MATCHING PATTERN "*.h")
 
-file(GLOB WINPR_HEADERS "winpr/*.h")
-install(FILES ${WINPR_HEADERS} DESTINATION ${WINPR_INSTALL_INCLUDE_DIR} COMPONENT headers)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/winpr/version.h DESTINATION ${WINPR_INSTALL_INCLUDE_DIR} COMPONENT headers)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/winpr/wtypes.h DESTINATION ${WINPR_INSTALL_INCLUDE_DIR} COMPONENT headers)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/winpr/build-config.h DESTINATION ${WINPR_INSTALL_INCLUDE_DIR} COMPONENT headers)
-install(DIRECTORY winpr/tools DESTINATION ${WINPR_INSTALL_INCLUDE_DIR} COMPONENT headers FILES_MATCHING PATTERN "*.h")

winpr/libwinpr/bcrypt/bcrypt.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #ifndef _WIN32
 #include <winpr/bcrypt.h>

winpr/libwinpr/clipboard/clipboard.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/collections.h>

winpr/libwinpr/clipboard/posix.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #if defined(__clang__)
 #pragma clang diagnostic push

winpr/libwinpr/clipboard/synthetic.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <errno.h>
 #include <winpr/crt.h>

winpr/libwinpr/comm/comm.c

@@ -20,9 +20,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #if defined __linux__ && !defined ANDROID
 

winpr/libwinpr/comm/comm.h

@@ -29,7 +29,7 @@
 #include <winpr/comm.h>
 
 #include "../handle/handle.h"
-#include "config.h"
+#include <winpr/config.h>
 
 struct winpr_comm
 {

winpr/libwinpr/comm/comm_io.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #if defined __linux__ && !defined ANDROID
 

winpr/libwinpr/comm/comm_ioctl.c

@@ -20,9 +20,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #if defined __linux__ && !defined ANDROID
 

winpr/libwinpr/crt/alignment.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 

winpr/libwinpr/crt/buffer.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 

winpr/libwinpr/crt/conversion.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/string.h>

winpr/libwinpr/crt/memory.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 

winpr/libwinpr/crt/string.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <errno.h>
 #include <stdio.h>

winpr/libwinpr/crt/unicode.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <errno.h>
 #include <wctype.h>

winpr/libwinpr/crypto/cert.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crypto.h>
 

winpr/libwinpr/crypto/cipher.c

@@ -16,9 +16,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 

winpr/libwinpr/crypto/crypto.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crypto.h>
 

winpr/libwinpr/crypto/hash.c

@@ -16,9 +16,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 

winpr/libwinpr/crypto/rand.c

@@ -16,9 +16,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 

winpr/libwinpr/dsparse/dsparse.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/dsparse.h>
 #include <winpr/assert.h>

winpr/libwinpr/environment/environment.c

@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/platform.h>

winpr/libwinpr/error/error.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/error.h>
 

winpr/libwinpr/file/file.c

@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif /* HAVE_CONFIG_H */
 
 #if defined(__FreeBSD_kernel__) && defined(__GLIBC__)
 #define _GNU_SOURCE

winpr/libwinpr/file/generic.c

@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/path.h>

winpr/libwinpr/file/namedPipeClient.c

@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/path.h>

winpr/libwinpr/file/pattern.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/handle.h>

winpr/libwinpr/handle/handle.c

@@ -18,9 +18,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/handle.h>
 

winpr/libwinpr/handle/nonehandle.c

@@ -18,9 +18,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include "nonehandle.h"
 

winpr/libwinpr/input/keycode.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 

winpr/libwinpr/input/scancode.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 

winpr/libwinpr/input/virtualkey.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 

winpr/libwinpr/interlocked/interlocked.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/synch.h>
 #include <winpr/handle.h>

winpr/libwinpr/io/device.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/io.h>
 

winpr/libwinpr/io/io.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/io.h>
 

winpr/libwinpr/library/library.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/platform.h>

winpr/libwinpr/memory/memory.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 

winpr/libwinpr/ncrypt/ncrypt.h

@@ -20,9 +20,7 @@
 #ifndef WINPR_LIBWINPR_NCRYPT_NCRYPT_H_
 #define WINPR_LIBWINPR_NCRYPT_NCRYPT_H_
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/bcrypt.h>
 #include <winpr/crypto.h>

winpr/libwinpr/nt/nt.c

@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/library.h>

winpr/libwinpr/nt/ntstatus.c

@@ -18,9 +18,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/nt.h>

winpr/libwinpr/path/path.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/tchar.h>

winpr/libwinpr/path/shell.c

@@ -18,9 +18,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>

winpr/libwinpr/path/shell_ios.m

@@ -20,9 +20,7 @@
 
 #import <Foundation/Foundation.h>
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include "shell_ios.h"
 

winpr/libwinpr/pipe/pipe.c

@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/path.h>

winpr/libwinpr/pool/callback.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/pool.h>

winpr/libwinpr/pool/callback_cleanup.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/pool.h>

winpr/libwinpr/pool/cleanup_group.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/pool.h>

winpr/libwinpr/pool/io.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/pool.h>

winpr/libwinpr/pool/pool.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/pool.h>

winpr/libwinpr/pool/synch.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/pool.h>

winpr/libwinpr/pool/timer.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/pool.h>

winpr/libwinpr/pool/work.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/pool.h>

winpr/libwinpr/registry/registry.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/registry.h>
 

winpr/libwinpr/registry/registry_reg.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <errno.h>
 #include <stdio.h>

winpr/libwinpr/rpc/rpc.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/rpc.h>

winpr/libwinpr/security/security.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 

winpr/libwinpr/shell/shell.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/shell.h>
 

winpr/libwinpr/smartcard/smartcard.c

@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/library.h>

winpr/libwinpr/smartcard/smartcard_inspect.c

@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/wlog.h>

winpr/libwinpr/smartcard/smartcard_pcsc.c

@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #ifndef _WIN32
 

winpr/libwinpr/smartcard/smartcard_winscard.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #ifdef _WIN32
 

winpr/libwinpr/sspi/CredSSP/credssp.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/sspi.h>

winpr/libwinpr/sspi/Kerberos/kerberos.c

@@ -18,9 +18,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>

winpr/libwinpr/sspi/NTLM/ntlm.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/assert.h>

winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/assert.h>
 

winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.h

@@ -20,9 +20,7 @@
 #ifndef WINPR_SSPI_NTLM_AV_PAIRS_H
 #define WINPR_SSPI_NTLM_AV_PAIRS_H
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include "ntlm.h"
 

winpr/libwinpr/sspi/NTLM/ntlm_compute.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/assert.h>
 

winpr/libwinpr/sspi/NTLM/ntlm_message.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include "ntlm.h"
 #include "../sspi.h"

winpr/libwinpr/sspi/Negotiate/negotiate.c

@@ -18,9 +18,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/sspi.h>

winpr/libwinpr/sspi/Schannel/schannel.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/sspi.h>

winpr/libwinpr/sspi/Schannel/schannel_openssl.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include "schannel_openssl.h"
 

winpr/libwinpr/sspi/sspi.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #if defined(__clang__)
 #pragma clang diagnostic push

winpr/libwinpr/sspi/sspi_export.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #ifdef _WIN32
 #define SEC_ENTRY __stdcall

winpr/libwinpr/sspi/sspi_gss.c

@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/library.h>

winpr/libwinpr/sspi/sspi_winpr.c

@@ -18,9 +18,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/windows.h>
 

winpr/libwinpr/sspicli/sspicli.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/assert.h>
 #include <winpr/sspicli.h>

winpr/libwinpr/synch/address.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/synch.h>
 

winpr/libwinpr/synch/barrier.c

@@ -18,9 +18,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/synch.h>
 #include <winpr/assert.h>

winpr/libwinpr/synch/critical.c

@@ -18,9 +18,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/tchar.h>
 #include <winpr/synch.h>

winpr/libwinpr/synch/event.c

@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <stdio.h>
 #include <string.h>

winpr/libwinpr/synch/event.h

@@ -21,9 +21,7 @@
 
 #include "../handle/handle.h"
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #ifdef HAVE_SYS_EVENTFD_H
 #include <sys/eventfd.h>

winpr/libwinpr/synch/init.c

@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/synch.h>
 #include <winpr/interlocked.h>

winpr/libwinpr/synch/mutex.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/synch.h>
 #include <winpr/debug.h>

winpr/libwinpr/synch/pollset.h

@@ -22,9 +22,7 @@
 #include <winpr/wtypes.h>
 #include <winpr/synch.h>
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #ifndef _WIN32
 

winpr/libwinpr/synch/semaphore.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/synch.h>
 

winpr/libwinpr/synch/sleep.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/windows.h>
 

winpr/libwinpr/synch/synch.h

@@ -20,9 +20,7 @@
 #ifndef WINPR_SYNCH_PRIVATE_H
 #define WINPR_SYNCH_PRIVATE_H
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/platform.h>
 

winpr/libwinpr/synch/timer.c

@@ -18,9 +18,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/file.h>

winpr/libwinpr/synch/wait.c

@@ -18,9 +18,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

winpr/libwinpr/sysinfo/sysinfo.c

@@ -18,9 +18,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/sysinfo.h>
 #include <winpr/platform.h>

winpr/libwinpr/thread/argv.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/handle.h>

winpr/libwinpr/thread/process.c

@@ -18,9 +18,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/handle.h>
 #include "../handle/nonehandle.h"

winpr/libwinpr/thread/processor.c

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/handle.h>
 

winpr/libwinpr/thread/thread.c

@@ -20,9 +20,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
+#include <winpr/config.h>
-#include "config.h"
-#endif
 
 #include <winpr/assert.h>