From 83642a45451cf33547e02f8c6c441c261de29de3 Mon Sep 17 00:00:00 2001
From: "dfm%netscape.com"
 <dfm%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 4 Aug 1998 01:17:43 +0000
Subject: [PATCH] Removed ifdefs from privacy calls. Approved: nisheeth

git-svn-id: svn://10.0.0.236/trunk@7213 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/lib/layout/layform.c | 8 --------
 mozilla/lib/layout/laytags.c | 4 ----
 2 files changed, 12 deletions(-)

diff --git a/mozilla/lib/layout/layform.c b/mozilla/lib/layout/layform.c
index 08b8ed5c52b..4136e34f87d 100644
--- a/mozilla/lib/layout/layform.c
+++ b/mozilla/lib/layout/layform.c
@@ -44,9 +44,7 @@
 #pragma profile on
 #endif
 
-#ifdef PRIVACY_POLICIES
 #include "privacy.h"
-#endif
 
 #ifdef TRANSACTION_RECEIPTS 
 #include "receipt.h"
@@ -3351,18 +3349,12 @@ LO_SubmitForm(MWContext *context, LO_FormElementStruct *form_element)
 		return(NULL);
 	}
 
-#ifdef PRIVACY_POLICIES
 	/* Privacy Policy check.. Should this go elsewhere? */
-
 	if (!PRVCY_PrivacyPolicyConfirmSubmit(context,form_element))
 		return(NULL);
 
-#endif /* PRIVACY_POLICIES */
-
 #ifdef TRANSACTION_RECEIPTS
-#ifdef DEBUG_dfm
 	RT_SaveDocument(context, form_element);
-#endif
 #endif /* TRANSACTION_RECEIPTS */
 
 	return(submit_data);
diff --git a/mozilla/lib/layout/laytags.c b/mozilla/lib/layout/laytags.c
index f75c454f710..2612e6b8eac 100644
--- a/mozilla/lib/layout/laytags.c
+++ b/mozilla/lib/layout/laytags.c
@@ -41,10 +41,8 @@
 #include "libmocha.h"
 #include "libevent.h"
 
-#ifdef PRIVACY_POLICIES
 #include "shist.h"
 #include "privacy.h"
-#endif
 
 #include "intl_csi.h"
 /* WEBFONTS are defined only in laytags.c and layout.c */
@@ -6722,7 +6720,6 @@ XP_TRACE(("lo_LayoutTag(%d)\n", tag->type));
 						}
 					}						
 
-#ifdef PRIVACY_POLICIES
 					else if (!strcasecomp((char *)buff, "privacypolicy"))
 					{
 						char *policyURL;
@@ -6750,7 +6747,6 @@ XP_TRACE(("lo_LayoutTag(%d)\n", tag->type));
 								hist->privacy_policy_url = policyURL;
 						}	
 					}				
-#endif /* PRIVACY_POLICIES */		
 
 					PA_FREE(buff);
 				}