From fdb50afecba0cba373c7024ffbf1938714d6a0aa Mon Sep 17 00:00:00 2001 From: "dfm%netscape.com" Date: Mon, 3 Aug 1998 23:29:48 +0000 Subject: [PATCH] Removed ifdefs from netlib privacy-policy code. Approved: gagan --- network/main/mkgeturl.c | 2 -- network/main/mkutils.c | 8 -------- 2 files changed, 10 deletions(-) diff --git a/network/main/mkgeturl.c b/network/main/mkgeturl.c index a1ab954b7476..e32c119f5a43 100644 --- a/network/main/mkgeturl.c +++ b/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); diff --git a/network/main/mkutils.c b/network/main/mkutils.c index 1f104cd789d9..25ec43e186a2 100644 --- a/network/main/mkutils.c +++ b/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);