Removed ifdefs from netlib privacy-policy code. Approved: gagan

network/main/mkgeturl.c

@@ -4331,9 +4331,7 @@ NET_FreeURLStruct (URL_Struct * URL_s)
   PR_FREEIF(URL_s->add_crlf);
 
 	 PR_FREEIF(URL_s->page_services_url);
-#ifdef PRIVACY_POLICIES
     PR_FREEIF(URL_s->privacy_policy_url);
-#endif /* PRIVACY_POLICIES */
 
     PR_Free(URL_s);
 

network/main/mkutils.c

@@ -1442,13 +1442,9 @@ NET_ParseMimeHeader(FO_Present_Types outputFormat,
               {
 #define PAGE_SERVICES_REL "pageServices"
 
-#ifdef PRIVACY_POLICIES
 #define PRIVACY_POLICY_REL "privacyPolicy"
 				enum { UNKNOWN_REL_TYPE, PRIVACY_POLICY_REL_TYPE, 
 					PAGE_SERVICES_REL_TYPE } rel_type;
-#else
-				enum { UNKNOWN_REL_TYPE, PAGE_SERVICES_REL_TYPE } rel_type;
-#endif /* PRIVACY_POLICIES */
 
                 char * next_arg = strtok(value, ";");
 				char * link_val;
@@ -1478,10 +1474,8 @@ NET_ParseMimeHeader(FO_Present_Types outputFormat,
 
 						if(!PL_strcasecmp(rel, PAGE_SERVICES_REL))
 							rel_type = PAGE_SERVICES_REL_TYPE;
-#ifdef PRIVACY_POLICIES
 						else if (!PL_strcasecmp(rel, PRIVACY_POLICY_REL))
 							rel_type = PRIVACY_POLICY_REL_TYPE; 
-#endif /* PRIVACY_POLICIES */
                      }
 
                 	next_arg = strtok(NULL, ";");
@@ -1490,10 +1484,8 @@ NET_ParseMimeHeader(FO_Present_Types outputFormat,
 				/* if we fount a rel for page services assign it */
 				if(rel_type == PAGE_SERVICES_REL_TYPE)
 					URL_s->page_services_url = link_val;
-#ifdef PRIVACY_POLICIES
 				else if (rel_type == PRIVACY_POLICY_REL_TYPE)
 					URL_s->privacy_policy_url = link_val;
-#endif /* PRIVACY_POLICIES */
 				else
 					PR_FREEIF(link_val);