Freerdp remove #ifdef HAVE_CONFIG_H

kuchingking1 · Mar 3, 2022 · 4d03d7c · 4d03d7c
1 parent b2ad47a
commit 4d03d7c
Show file tree

Hide file tree

Showing 346 changed files with 6 additions and 691 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -863,9 +863,6 @@ else()
 	set(FREERDP_PROXY_PLUGINDIR "${PROXY_PLUGINDIR}")
 endif()
 
-# Declare we have config.h, generated later on.
-add_definitions("-DHAVE_CONFIG_H")
-
 # RPATH configuration
 set(CMAKE_SKIP_BUILD_RPATH FALSE)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)

diff --git a/channels/audin/client/alsa/audin_alsa.c b/channels/audin/client/alsa/audin_alsa.c
@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/channels/audin/client/audin_main.c b/channels/audin/client/audin_main.c
@@ -20,9 +20,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <errno.h>
 #include <winpr/assert.h>

diff --git a/channels/audin/client/audin_main.h b/channels/audin/client/audin_main.h
@@ -20,9 +20,7 @@
 #ifndef FREERDP_CHANNEL_AUDIN_CLIENT_MAIN_H
 #define FREERDP_CHANNEL_AUDIN_CLIENT_MAIN_H
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <freerdp/dvc.h>
 #include <freerdp/types.h>

diff --git a/channels/audin/client/ios/audin_ios.m b/channels/audin/client/ios/audin_ios.m
@@ -18,9 +18,7 @@
   * limitations under the License.
   */
 
- #ifdef HAVE_CONFIG_H
  #include <freerdp/config.h>
- #endif
 
  #include <stdio.h>
  #include <stdlib.h>

diff --git a/channels/audin/client/mac/audin_mac.m b/channels/audin/client/mac/audin_mac.m
@@ -18,9 +18,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/channels/audin/client/opensles/audin_opensl_es.c b/channels/audin/client/opensles/audin_opensl_es.c
@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <winpr/assert.h>
 #include <stdio.h>

diff --git a/channels/audin/client/oss/audin_oss.c b/channels/audin/client/oss/audin_oss.c
@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/channels/audin/client/pulse/audin_pulse.c b/channels/audin/client/pulse/audin_pulse.c
@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/channels/audin/client/sndio/audin_sndio.c b/channels/audin/client/sndio/audin_sndio.c
@@ -20,9 +20,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <sndio.h>
 

diff --git a/channels/audin/client/winmm/audin_winmm.c b/channels/audin/client/winmm/audin_winmm.c
@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/channels/audin/server/audin.c b/channels/audin/server/audin.c
@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/channels/client/addin.c b/channels/client/addin.c
@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/assert.h>

diff --git a/channels/cliprdr/client/cliprdr_format.c b/channels/cliprdr/client/cliprdr_format.c
@@ -20,9 +20,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/print.h>

diff --git a/channels/cliprdr/client/cliprdr_main.c b/channels/cliprdr/client/cliprdr_main.c
@@ -20,9 +20,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <winpr/wtypes.h>
 #include <winpr/assert.h>

diff --git a/channels/cliprdr/server/cliprdr_main.c b/channels/cliprdr/server/cliprdr_main.c
@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/print.h>

diff --git a/channels/disp/client/disp_main.c b/channels/disp/client/disp_main.c
@@ -20,9 +20,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/channels/disp/client/disp_main.h b/channels/disp/client/disp_main.h
@@ -22,9 +22,7 @@
 #ifndef FREERDP_CHANNEL_DISP_CLIENT_MAIN_H
 #define FREERDP_CHANNEL_DISP_CLIENT_MAIN_H
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <freerdp/dvc.h>
 #include <freerdp/types.h>

diff --git a/channels/disp/disp_common.c b/channels/disp/disp_common.c
@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/stream.h>

diff --git a/channels/disp/server/disp_main.c b/channels/disp/server/disp_main.c
@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include "disp_main.h"
 #include <stdio.h>

diff --git a/channels/drdynvc/client/drdynvc_main.c b/channels/drdynvc/client/drdynvc_main.c
@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/stream.h>

diff --git a/channels/drdynvc/server/drdynvc_main.c b/channels/drdynvc/server/drdynvc_main.c
@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/print.h>

diff --git a/channels/drive/client/drive_file.c b/channels/drive/client/drive_file.c
@@ -25,9 +25,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <errno.h>
 #include <stdio.h>

diff --git a/channels/drive/client/drive_main.c b/channels/drive/client/drive_main.c
@@ -21,9 +21,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <errno.h>
 #include <stdio.h>

diff --git a/channels/echo/client/echo_main.c b/channels/echo/client/echo_main.c
@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/channels/echo/client/echo_main.h b/channels/echo/client/echo_main.h
@@ -20,9 +20,7 @@
 #ifndef FREERDP_CHANNEL_ECHO_CLIENT_MAIN_H
 #define FREERDP_CHANNEL_ECHO_CLIENT_MAIN_H
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <freerdp/dvc.h>
 #include <freerdp/types.h>

diff --git a/channels/echo/server/echo_main.c b/channels/echo/server/echo_main.c
@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/channels/encomsp/client/encomsp_main.c b/channels/encomsp/client/encomsp_main.c
@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/assert.h>

diff --git a/channels/encomsp/server/encomsp_main.c b/channels/encomsp/server/encomsp_main.c
@@ -19,9 +19,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/print.h>

diff --git a/channels/geometry/client/geometry_main.c b/channels/geometry/client/geometry_main.c
@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/channels/geometry/client/geometry_main.h b/channels/geometry/client/geometry_main.h
@@ -20,9 +20,7 @@
 #ifndef FREERDP_CHANNEL_GEOMETRY_CLIENT_MAIN_H
 #define FREERDP_CHANNEL_GEOMETRY_CLIENT_MAIN_H
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <freerdp/dvc.h>
 #include <freerdp/types.h>

diff --git a/channels/gfxredir/gfxredir_common.c b/channels/gfxredir/gfxredir_common.c
@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/stream.h>

diff --git a/channels/gfxredir/server/gfxredir_main.c b/channels/gfxredir/server/gfxredir_main.c
@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include "gfxredir_main.h"
 #include <stdio.h>

diff --git a/channels/parallel/client/parallel_main.c b/channels/parallel/client/parallel_main.c
@@ -20,9 +20,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/channels/printer/client/cups/printer_cups.c b/channels/printer/client/cups/printer_cups.c
@@ -20,9 +20,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/channels/printer/client/printer_main.c b/channels/printer/client/printer_main.c
@@ -21,9 +21,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/channels/printer/client/win/printer_win.c b/channels/printer/client/win/printer_win.c
@@ -20,9 +20,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <winpr/crt.h>
 #include <winpr/string.h>

diff --git a/channels/rail/client/rail_main.c b/channels/rail/client/rail_main.c
@@ -23,9 +23,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <winpr/crt.h>
 

diff --git a/channels/rail/client/rail_orders.c b/channels/rail/client/rail_orders.c
@@ -22,9 +22,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <winpr/crt.h>
 

diff --git a/channels/rdpdr/client/devman.c b/channels/rdpdr/client/devman.c
@@ -21,9 +21,7 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <freerdp/config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>