Merge pull request #2667 from iskunk/new-1

Use config_ac.h consistently and correctly

common/pixman-region.c

@@ -63,8 +63,11 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#if defined(HAVE_CONFIG_H)
-#include <config_ac.h>
+#ifndef PIXMAN_REGION_MAX
+#error "This file should be #included from pixman-region16.c, not compiled directly"
+#endif
+#ifndef CONFIG_AC_H
+#error "config_ac.h not visible in pixman-region.c"
 #endif
 
 #define PIXREGION_NIL(reg) ((reg)->data && !(reg)->data->numRects)

genkeymap/evdev-map.c

@@ -22,6 +22,10 @@
  * xfree86(base)->evdev keycode mapping
  */
 
+#if defined(HAVE_CONFIG_H)
+#include <config_ac.h>
+#endif
+
 int xfree86_to_evdev[137 - 8 + 1] =
 {
     /* MDSW */ 203,

libipm/libipm.h

@@ -26,10 +26,6 @@
 #if !defined(LIBIPM_H)
 #define LIBIPM_H
 
-#if defined(HAVE_CONFIG_H)
-#include <config_ac.h>
-#endif
-
 #include "arch.h"
 #include "libipm_facilities.h"
 

sesman/chansrv/pcsc/wrapper/winscard.c

@@ -1,3 +1,6 @@
+#if defined(HAVE_CONFIG_H)
+#include <config_ac.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>

sesman/chansrv/pcsc/xrdp_pcsc.c

@@ -1,3 +1,6 @@
+#if defined(HAVE_CONFIG_H)
+#include <config_ac.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>

tools/devel/gtcp_proxy/gtcp-proxy.c

@@ -16,6 +16,10 @@
  * limitations under the License.
  */
 
+#if defined(HAVE_CONFIG_H)
+#include <config_ac.h>
+#endif
+
 #include <stdio.h>
 #include <gtk/gtk.h>
 #include <pthread.h>

tools/devel/gtcp_proxy/gtcp.c

@@ -16,6 +16,10 @@
  * limitations under the License.
  */
 
+#if defined(HAVE_CONFIG_H)
+#include <config_ac.h>
+#endif
+
 #include "gtcp.h"
 
 /**

tools/devel/gtcp_proxy/hexdump.c

@@ -16,6 +16,10 @@
  * limitations under the License.
  */
 
+#if defined(HAVE_CONFIG_H)
+#include <config_ac.h>
+#endif
+
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>