Browse Source

Fix remaining usages of config.h

Brian Aker 12 years ago
parent
commit
fb60497c4d
10 changed files with 12 additions and 12 deletions
  1. 3 3
      .bzrignore
  2. 1 1
      Makefile.am
  3. 1 1
      benchmark/benchmark.cc
  4. 1 1
      benchmark/blobslap_client.cc
  5. 1 1
      benchmark/blobslap_worker.cc
  6. 1 1
      bin/arguments.cc
  7. 1 1
      bin/function.cc
  8. 1 1
      bin/gearadmin.cc
  9. 1 1
      bin/gearman.cc
  10. 1 1
      configure.ac

+ 3 - 3
.bzrignore

@@ -31,9 +31,9 @@ bin/gearadmin
 bin/gearman
 bin/wait
 build-aux/
-config.h
-config.h.in
-config.in
+gear_config.h
+gear_config.h.in
+gear_config.in
 config.log
 config.status
 config/pandora_vc_revinfo

+ 1 - 1
Makefile.am

@@ -92,7 +92,7 @@ maintainer-clean-local:
 	-rm build-aux/install-sh
 	-rm build-aux/ltmain.sh
 	-rm build-aux/missing
-	-rm config.in
+	-rm gear_config.in
 	-rm config.log
 	-rm config.status
 	-rm configure

+ 1 - 1
benchmark/benchmark.cc

@@ -41,7 +41,7 @@
  * @brief Common benchmark functions
  */
 
-#include "config.h"
+#include "gear_config.h"
 
 #include <benchmark/benchmark.h>
 #include <cstdio>

+ 1 - 1
benchmark/blobslap_client.cc

@@ -41,7 +41,7 @@
  * @brief Blob slap client utility
  */
 
-#include "config.h"
+#include "gear_config.h"
 #include <benchmark/benchmark.h>
 
 #include <iostream>

+ 1 - 1
benchmark/blobslap_worker.cc

@@ -42,7 +42,7 @@
  * @brief Blob slap worker utility
  */
 
-#include "config.h"
+#include "gear_config.h"
 #include <benchmark/benchmark.h>
 #include <boost/program_options.hpp>
 #include <cerrno>

+ 1 - 1
bin/arguments.cc

@@ -36,7 +36,7 @@
  */
 
 
-#include "config.h"
+#include "gear_config.h"
 
 #include <cstdlib>
 #include <cstring>

+ 1 - 1
bin/function.cc

@@ -36,7 +36,7 @@
  */
 
 
-#include "config.h"
+#include "gear_config.h"
 
 #include <cstring>
 #include <iostream>

+ 1 - 1
bin/gearadmin.cc

@@ -35,7 +35,7 @@
  *
  */
 
-#include "config.h"
+#include "gear_config.h"
 
 #include <cstdio>
 #include <cstdlib>

+ 1 - 1
bin/gearman.cc

@@ -36,7 +36,7 @@
  *
  */
 
-#include "config.h"
+#include "gear_config.h"
 
 #include <assert.h>
 #include <errno.h>

+ 1 - 1
configure.ac

@@ -17,7 +17,7 @@ AC_USE_SYSTEM_EXTENSIONS
 
 AM_INIT_AUTOMAKE([1.11 color-tests -Wno-portability subdir-objects foreign tar-ustar])
 
-AC_CONFIG_HEADERS([config.h:config.in])dnl Keep filename to 8.3 for MS-DOS.
+AC_CONFIG_HEADERS([gear_config.h:gear_config.in])dnl Keep filename to 8.3 for MS-DOS.
 AC_CONFIG_SRCDIR([libgearman/gearman.cc])
 
 GEARMAN_LIBRARY_VERSION=7:0:0

Some files were not shown because too many files changed in this diff