From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 30 Jan 2016 06:24:40 +0000 (+1300)
Subject: Move helpers/defines.h to src/helper/protocol_defines.h
X-Git-Tag: SQUID_4_0_5~16^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=079b1d0f88b88a5b868deb257cc923b79ab7cd8e;p=thirdparty%2Fsquid.git

Move helpers/defines.h to src/helper/protocol_defines.h
---

diff --git a/configure.ac b/configure.ac
index b91cf976e3..d61e5260cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3796,7 +3796,6 @@ AC_CONFIG_FILES([
 	doc/manuals/Makefile
 	doc/release-notes/Makefile
 	errors/Makefile
-	helpers/Makefile
 	icons/Makefile
 	lib/Makefile
 	lib/libTrie/Makefile
diff --git a/helpers/Makefile.am b/helpers/Makefile.am
deleted file mode 100644
index 5051f96ebc..0000000000
--- a/helpers/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-## Copyright (C) 1996-2016 The Squid Software Foundation and contributors
-##
-## Squid software is distributed under GPLv2+ license and includes
-## contributions from numerous individuals and organizations.
-## Please see the COPYING and CONTRIBUTORS files for details.
-##
-
-EXTRA_DIST = defines.h
diff --git a/src/acl/external/AD_group/ext_ad_group_acl.cc b/src/acl/external/AD_group/ext_ad_group_acl.cc
index 4f06fa7561..87342de30e 100644
--- a/src/acl/external/AD_group/ext_ad_group_acl.cc
+++ b/src/acl/external/AD_group/ext_ad_group_acl.cc
@@ -66,7 +66,7 @@
  */
 
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "include/util.h"
 
 #if _SQUID_CYGWIN_
diff --git a/src/acl/external/LDAP_group/ext_ldap_group_acl.cc b/src/acl/external/LDAP_group/ext_ldap_group_acl.cc
index af500eb642..0356873b78 100644
--- a/src/acl/external/LDAP_group/ext_ldap_group_acl.cc
+++ b/src/acl/external/LDAP_group/ext_ldap_group_acl.cc
@@ -38,7 +38,7 @@
  * OpenSSL libraries linked into openldap. See http://www.openssl.org/
  */
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 #include "util.h"
 
diff --git a/src/acl/external/LM_group/ext_lm_group_acl.cc b/src/acl/external/LM_group/ext_lm_group_acl.cc
index 5beac3d969..1c8cdff27f 100644
--- a/src/acl/external/LM_group/ext_lm_group_acl.cc
+++ b/src/acl/external/LM_group/ext_lm_group_acl.cc
@@ -76,7 +76,7 @@
  */
 
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 #include "util.h"
 
diff --git a/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc b/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc
index e27d6dedda..f42902420c 100644
--- a/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc
+++ b/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc
@@ -36,7 +36,7 @@
 
 /* Squid-3.X includes */
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 #include "util.h"
 
diff --git a/src/acl/external/file_userip/ext_file_userip_acl.cc b/src/acl/external/file_userip/ext_file_userip_acl.cc
index 6c1e5b9b29..f9ed7fb18a 100644
--- a/src/acl/external/file_userip/ext_file_userip_acl.cc
+++ b/src/acl/external/file_userip/ext_file_userip_acl.cc
@@ -27,7 +27,7 @@
  *
  */
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 #include "util.h"
 
diff --git a/src/acl/external/kerberos_ldap_group/kerberos_ldap_group.cc b/src/acl/external/kerberos_ldap_group/kerberos_ldap_group.cc
index 391f5eae77..25189f7a7d 100644
--- a/src/acl/external/kerberos_ldap_group/kerberos_ldap_group.cc
+++ b/src/acl/external/kerberos_ldap_group/kerberos_ldap_group.cc
@@ -36,7 +36,7 @@
  */
 
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 #include "util.h"
 
diff --git a/src/acl/external/session/ext_session_acl.cc b/src/acl/external/session/ext_session_acl.cc
index 600230d173..30504f800b 100644
--- a/src/acl/external/session/ext_session_acl.cc
+++ b/src/acl/external/session/ext_session_acl.cc
@@ -29,7 +29,7 @@
 #if HAVE_CONFIG_H
 #include "squid.h"
 #endif
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 
 #include <cstdlib>
 #include <cstring>
diff --git a/src/acl/external/time_quota/ext_time_quota_acl.cc b/src/acl/external/time_quota/ext_time_quota_acl.cc
index 63b5a1926b..3b7950f652 100644
--- a/src/acl/external/time_quota/ext_time_quota_acl.cc
+++ b/src/acl/external/time_quota/ext_time_quota_acl.cc
@@ -27,7 +27,7 @@
  */
 
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 
 #include <cstdarg>
 #include <cstdlib>
diff --git a/src/acl/external/unix_group/check_group.cc b/src/acl/external/unix_group/check_group.cc
index daf2369169..a428325f3c 100644
--- a/src/acl/external/unix_group/check_group.cc
+++ b/src/acl/external/unix_group/check_group.cc
@@ -62,7 +62,7 @@
  *
  */
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 #include "util.h"
 
diff --git a/src/auth/basic/NCSA/basic_ncsa_auth.cc b/src/auth/basic/NCSA/basic_ncsa_auth.cc
index 1b5068626f..2b95e7083a 100644
--- a/src/auth/basic/NCSA/basic_ncsa_auth.cc
+++ b/src/auth/basic/NCSA/basic_ncsa_auth.cc
@@ -26,7 +26,7 @@
 
 #include "squid.h"
 #include "auth/basic/NCSA/crypt_md5.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 
 #include <string>
diff --git a/src/auth/basic/PAM/basic_pam_auth.cc b/src/auth/basic/PAM/basic_pam_auth.cc
index 80e560099f..ea9d517234 100644
--- a/src/auth/basic/PAM/basic_pam_auth.cc
+++ b/src/auth/basic/PAM/basic_pam_auth.cc
@@ -71,7 +71,7 @@
  *  Initial version
  */
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 #include "util.h"
 
diff --git a/src/auth/basic/RADIUS/basic_radius_auth.cc b/src/auth/basic/RADIUS/basic_radius_auth.cc
index 97037964d7..763c3c8512 100644
--- a/src/auth/basic/RADIUS/basic_radius_auth.cc
+++ b/src/auth/basic/RADIUS/basic_radius_auth.cc
@@ -56,7 +56,7 @@
 #include "squid.h"
 #include "auth/basic/RADIUS/radius-util.h"
 #include "auth/basic/RADIUS/radius.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "md5.h"
 
 #include <cctype>
diff --git a/src/auth/basic/SASL/basic_sasl_auth.cc b/src/auth/basic/SASL/basic_sasl_auth.cc
index 7bc271220d..2464bde279 100644
--- a/src/auth/basic/SASL/basic_sasl_auth.cc
+++ b/src/auth/basic/SASL/basic_sasl_auth.cc
@@ -33,7 +33,7 @@
  *
  */
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 #include "util.h"
 
diff --git a/src/auth/basic/SMB/basic_smb_auth.cc b/src/auth/basic/SMB/basic_smb_auth.cc
index 4ab10b4a67..0145a32084 100644
--- a/src/auth/basic/SMB/basic_smb_auth.cc
+++ b/src/auth/basic/SMB/basic_smb_auth.cc
@@ -25,7 +25,7 @@
  */
 
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 #include "util.h"
 
diff --git a/src/auth/basic/SSPI/basic_sspi_auth.cc b/src/auth/basic/SSPI/basic_sspi_auth.cc
index 8c7c006d78..6781cfb1fb 100644
--- a/src/auth/basic/SSPI/basic_sspi_auth.cc
+++ b/src/auth/basic/SSPI/basic_sspi_auth.cc
@@ -34,7 +34,7 @@
 
 #include "squid.h"
 #include "auth/basic/SSPI/valid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 #include "util.h"
 
diff --git a/src/auth/basic/fake/fake.cc b/src/auth/basic/fake/fake.cc
index f574def848..901fe8ddba 100644
--- a/src/auth/basic/fake/fake.cc
+++ b/src/auth/basic/fake/fake.cc
@@ -43,7 +43,7 @@
  */
 
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 
 #include <iostream>
 #include <string>
diff --git a/src/auth/basic/getpwnam/basic_getpwnam_auth.cc b/src/auth/basic/getpwnam/basic_getpwnam_auth.cc
index 6f181143aa..6a037fee4c 100644
--- a/src/auth/basic/getpwnam/basic_getpwnam_auth.cc
+++ b/src/auth/basic/getpwnam/basic_getpwnam_auth.cc
@@ -33,7 +33,7 @@
  */
 
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 
 #include <cstdlib>
diff --git a/src/auth/digest/LDAP/digest_pw_auth.cc b/src/auth/digest/LDAP/digest_pw_auth.cc
index 1c2397067a..ae37bda0c6 100644
--- a/src/auth/digest/LDAP/digest_pw_auth.cc
+++ b/src/auth/digest/LDAP/digest_pw_auth.cc
@@ -39,7 +39,7 @@
 #include "squid.h"
 #include "auth/digest/LDAP/digest_common.h"
 #include "auth/digest/LDAP/ldap_backend.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 
 #define PROGRAM_NAME "digest_ldap_auth"
 
diff --git a/src/auth/digest/eDirectory/digest_pw_auth.cc b/src/auth/digest/eDirectory/digest_pw_auth.cc
index de44054fc8..85077f9374 100644
--- a/src/auth/digest/eDirectory/digest_pw_auth.cc
+++ b/src/auth/digest/eDirectory/digest_pw_auth.cc
@@ -38,7 +38,7 @@
 #include "squid.h"
 #include "auth/digest/eDirectory/digest_common.h"
 #include "auth/digest/eDirectory/ldap_backend.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 
 #define PROGRAM_NAME "digest_edirectory_auth"
 
diff --git a/src/auth/digest/file/digest_file_auth.cc b/src/auth/digest/file/digest_file_auth.cc
index bb19e9da4c..1645cdb927 100644
--- a/src/auth/digest/file/digest_file_auth.cc
+++ b/src/auth/digest/file/digest_file_auth.cc
@@ -42,7 +42,7 @@
 #include "squid.h"
 #include "auth/digest/file/digest_common.h"
 #include "auth/digest/file/text_backend.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 
 static void
 GetHHA1(RequestData * requestData)
diff --git a/src/auth/negotiate/SSPI/negotiate_sspi_auth.cc b/src/auth/negotiate/SSPI/negotiate_sspi_auth.cc
index 07f7e285cb..02355d0622 100644
--- a/src/auth/negotiate/SSPI/negotiate_sspi_auth.cc
+++ b/src/auth/negotiate/SSPI/negotiate_sspi_auth.cc
@@ -45,7 +45,7 @@
 
 #include "squid.h"
 #include "base64.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "ntlmauth/ntlmauth.h"
 #include "ntlmauth/support_bits.cci"
 #include "sspwin32.h"
diff --git a/src/auth/ntlm/SMB_LM/ntlm_smb_lm_auth.cc b/src/auth/ntlm/SMB_LM/ntlm_smb_lm_auth.cc
index 369bc1853c..edca1d2e16 100644
--- a/src/auth/ntlm/SMB_LM/ntlm_smb_lm_auth.cc
+++ b/src/auth/ntlm/SMB_LM/ntlm_smb_lm_auth.cc
@@ -24,7 +24,7 @@
 #include "squid.h"
 #include "base64.h"
 #include "compat/debug.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "ntlmauth/ntlmauth.h"
 #include "ntlmauth/support_bits.cci"
 #include "rfcnb/rfcnb.h"
diff --git a/src/auth/ntlm/SSPI/ntlm_sspi_auth.cc b/src/auth/ntlm/SSPI/ntlm_sspi_auth.cc
index 1275f3b178..afacbb570b 100644
--- a/src/auth/ntlm/SSPI/ntlm_sspi_auth.cc
+++ b/src/auth/ntlm/SSPI/ntlm_sspi_auth.cc
@@ -73,7 +73,7 @@
 
 #include "squid.h"
 #include "base64.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "ntlmauth/ntlmauth.h"
 #include "ntlmauth/support_bits.cci"
 #include "sspwin32.h"
diff --git a/src/auth/ntlm/fake/ntlm_fake_auth.cc b/src/auth/ntlm/fake/ntlm_fake_auth.cc
index d4ad42d851..2c3e2b80ae 100644
--- a/src/auth/ntlm/fake/ntlm_fake_auth.cc
+++ b/src/auth/ntlm/fake/ntlm_fake_auth.cc
@@ -35,7 +35,7 @@
 
 #include "squid.h"
 #include "base64.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "ntlmauth/ntlmauth.h"
 #include "ntlmauth/support_bits.cci"
 
diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index e6d169f818..6b77b2f1a2 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -18,3 +18,5 @@ libhelper_la_SOURCES = \
 	Reply.h \
 	Request.h \
 	ResultCode.h
+
+EXTRA_DIST= protocol_defines.h
diff --git a/helpers/defines.h b/src/helper/protocol_defines.h
similarity index 100%
rename from helpers/defines.h
rename to src/helper/protocol_defines.h
diff --git a/src/http/url_rewriters/fake/fake.cc b/src/http/url_rewriters/fake/fake.cc
index e76283e2eb..663643ca9e 100644
--- a/src/http/url_rewriters/fake/fake.cc
+++ b/src/http/url_rewriters/fake/fake.cc
@@ -43,7 +43,7 @@
  */
 
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 
 #include <cstring>
 
diff --git a/src/log/file/log_file_daemon.cc b/src/log/file/log_file_daemon.cc
index b8057f23da..7e1b03daf4 100644
--- a/src/log/file/log_file_daemon.cc
+++ b/src/log/file/log_file_daemon.cc
@@ -28,7 +28,7 @@
 #include <paths.h>
 #endif
 
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 
 /* parse buffer - ie, length of longest expected line */
 #define LOGFILE_BUF_LEN     65536
diff --git a/src/ssl/ssl_crtd.cc b/src/ssl/ssl_crtd.cc
index ad7dc00ecd..fabfe750ba 100644
--- a/src/ssl/ssl_crtd.cc
+++ b/src/ssl/ssl_crtd.cc
@@ -7,7 +7,7 @@
  */
 
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "ssl/certificate_db.h"
 #include "ssl/crtd_message.h"