Bug 1240284 - Remove ordinals and description statements from def files. r=glandium
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Tue, 02 Feb 2016 08:08:00 +0100
changeset 25015 8262aa13936c778e5b5b919523b0d19ec75bc303
parent 25014 945ced27efdba705d2778602fc93346ca293fe9a
child 25016 9be1d7c29bb314552261b6a05628e8cbd3474028
push id295
push userclokep@gmail.com
push dateMon, 06 Jun 2016 19:43:24 +0000
reviewersglandium
bugs1240284
Bug 1240284 - Remove ordinals and description statements from def files. r=glandium Silence linker warnings LNK4222 and LNK4017. Also includes some whitespace fixes.
ldap/c-sdk/libraries/libldap/libldap.def
ldap/c-sdk/libraries/libldif/libldif.def
ldap/c-sdk/libraries/libprldap/libprldap.def
mailnews/mapi/mapiDll/Mapi32.DEF
mailnews/mapi/mapihook/build/MapiProxy.def
--- a/ldap/c-sdk/libraries/libldap/libldap.def
+++ b/ldap/c-sdk/libraries/libldap/libldap.def
@@ -1,357 +1,352 @@
 ;
 ; ***** BEGIN LICENSE BLOCK *****
-; Version: MPL 1.1/GPL 2.0/LGPL 2.1
-; 
-; The contents of this file are subject to the Mozilla Public License Version 
-; 1.1 (the "License"); you may not use this file except in compliance with 
-; the License. You may obtain a copy of the License at 
+; Version: MPL 1.1/GPL 2.0/LGPL 2.
+;
+; The contents of this file are subject to the Mozilla Public License Version
+; 1.1 (the "License"); you may not use this file except in compliance with
+; the License. You may obtain a copy of the License at
 ; http://www.mozilla.org/MPL/
-; 
+;
 ; Software distributed under the License is distributed on an "AS IS" basis,
 ; WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
 ; for the specific language governing rights and limitations under the
 ; License.
-; 
+;
 ; The Original Code is Mozilla Communicator client code.
-; 
+;
 ; The Initial Developer of the Original Code is
 ; Netscape Communications Corporation.
 ; Portions created by the Initial Developer are Copyright (C) 1996-1999
 ; the Initial Developer. All Rights Reserved.
-; 
+;
 ; Contributor(s):
-; 
+;
 ; Alternatively, the contents of this file may be used under the terms of
 ; either of the GNU General Public License Version 2 or later (the "GPL"),
 ; or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
 ; in which case the provisions of the GPL or the LGPL are applicable instead
 ; of those above. If you wish to allow use of your version of this file only
 ; under the terms of either the GPL or the LGPL, and not to allow others to
 ; use your version of this file under the terms of the MPL, indicate your
 ; decision by deleting the provisions above and replace them with the notice
 ; and other provisions required by the GPL or the LGPL. If you do not delete
 ; the provisions above, a recipient may use your version of this file under
 ; the terms of any one of the MPL, the GPL or the LGPL.
-; 
-; ***** END LICENSE BLOCK ***** 
+;
+; ***** END LICENSE BLOCK *****
 
-LIBRARY         LDAP60
-DESCRIPTION     'Lightweight Directory Access Protocol Client API for 32-bit Windows'
-VERSION		6.0
-HEAPSIZE        4096
+LIBRARY        LDAP60
+VERSION        6.0
+HEAPSIZE       4096
 
 EXPORTS
-; we need to manually assign ordinal numbers so we can add new routines
-; and not disturb the ordinals and thus not require callers to relink.
-; 
 ; exports list (generated by genexports.pl)
-; 
+;
+    ldap_abandon
+    ldap_add
+    ldap_unbind
 
-	ldap_abandon		@10
-	ldap_add		@11
-	ldap_unbind		@13
-
-; 	ldap_enable_cache		@14
-; 	ldap_disable_cache		@15
-; 	ldap_destroy_cache		@16
-; 	ldap_flush_cache		@17
-; 	ldap_uncache_entry		@18
+;     ldap_enable_cache
+;     ldap_disable_cache
+;     ldap_destroy_cache
+;     ldap_flush_cache
+;     ldap_uncache_entry
 
-	ldap_compare		@19
-	ldap_delete		@20
-	ldap_result2error		@21
-	ldap_err2string		@22
-	ldap_modify		@23
-	ldap_modrdn		@24
-	ldap_open		@25
-	ldap_first_entry		@26
-	ldap_next_entry		@27
-	ldap_get_dn		@30
-	ldap_dn2ufn		@31
-	ldap_first_attribute		@32
-	ldap_next_attribute		@33
-	ldap_get_values		@34
-	ldap_get_values_len		@35
-	ldap_count_entries		@36
-	ldap_count_values		@37
-	ldap_value_free		@38
-	ldap_explode_dn		@39
-	ldap_result		@40
-	ldap_msgfree		@41
-	ldap_search		@43
-	ldap_add_s		@44
-	ldap_bind_s		@45
-	ldap_unbind_s		@46
-	ldap_delete_s		@47
-	ldap_modify_s		@48
-	ldap_modrdn_s		@49
-	ldap_search_s		@50
-	ldap_search_st		@51
-	ldap_compare_s		@52
-	ldap_ufn_search_c		@53
-	ldap_ufn_search_s		@54
-	ldap_init_getfilter		@55
-	ldap_getfilter_free		@56
-	ldap_getfirstfilter		@57
-	ldap_getnextfilter		@58
-	ldap_simple_bind		@59
-	ldap_simple_bind_s		@60
-	ldap_bind		@61
-	ldap_friendly_name		@62
-	ldap_free_friendlymap		@63
-	ldap_ufn_search_ct		@64
+    ldap_compare
+    ldap_delete
+    ldap_result2error
+    ldap_err2string
+    ldap_modify
+    ldap_modrdn
+    ldap_open
+    ldap_first_entry
+    ldap_next_entry
+    ldap_get_dn
+    ldap_dn2ufn
+    ldap_first_attribute
+    ldap_next_attribute
+    ldap_get_values
+    ldap_get_values_len
+    ldap_count_entries
+    ldap_count_values
+    ldap_value_free
+    ldap_explode_dn
+    ldap_result
+    ldap_msgfree
+    ldap_search
+    ldap_add_s
+    ldap_bind_s
+    ldap_unbind_s
+    ldap_delete_s
+    ldap_modify_s
+    ldap_modrdn_s
+    ldap_search_s
+    ldap_search_st
+    ldap_compare_s
+    ldap_ufn_search_c
+    ldap_ufn_search_s
+    ldap_init_getfilter
+    ldap_getfilter_free
+    ldap_getfirstfilter
+    ldap_getnextfilter
+    ldap_simple_bind
+    ldap_simple_bind_s
+    ldap_bind
+    ldap_friendly_name
+    ldap_free_friendlymap
+    ldap_ufn_search_ct
 
-; 	ldap_set_cache_options		@65
-; 	ldap_uncache_request		@66
+;     ldap_set_cache_options
+;     ldap_uncache_request
 
-	ldap_modrdn2		@67
-	ldap_modrdn2_s		@68
-	ldap_ufn_setfilter		@69
-	ldap_ufn_setprefix		@70
-	ldap_ufn_timeout		@71
-	ldap_init_getfilter_buf		@72
-	ldap_setfilteraffixes		@73
-	ldap_sort_entries		@74
-	ldap_sort_values		@75
-	ldap_sort_strcasecmp		@76
-	ldap_count_values_len		@77
-	ldap_name2template		@78
-	ldap_value_free_len		@79
+    ldap_modrdn2
+    ldap_modrdn2_s
+    ldap_ufn_setfilter
+    ldap_ufn_setprefix
+    ldap_ufn_timeout
+    ldap_init_getfilter_buf
+    ldap_setfilteraffixes
+    ldap_sort_entries
+    ldap_sort_values
+    ldap_sort_strcasecmp
+    ldap_count_values_len
+    ldap_name2template
+    ldap_value_free_len
 
 ;  manually comment and uncomment these five as necessary
-; 	ldap_kerberos_bind1		@80
-; 	ldap_kerberos_bind2		@81
-; 	ldap_kerberos_bind_s		@82
-; 	ldap_kerberos_bind1_s		@83
-; 	ldap_kerberos_bind2_s		@84
+;     ldap_kerberos_bind1
+;     ldap_kerberos_bind2
+;     ldap_kerberos_bind_s
+;     ldap_kerberos_bind1_s
+;     ldap_kerberos_bind2_s
 
-	ldap_init		@85
-	ldap_is_dns_dn		@86
-	ldap_explode_dns		@87
-	ldap_mods_free		@88
+    ldap_init
+    ldap_is_dns_dn
+    ldap_explode_dns
+    ldap_mods_free
 
-	ldap_is_ldap_url		@89
-	ldap_free_urldesc		@90
-	ldap_url_parse		@91
-	ldap_url_search		@92
-	ldap_url_search_s		@93
-	ldap_url_search_st		@94
-	ldap_set_rebind_proc		@95
-	ber_skip_tag		@100
-	ber_peek_tag		@101
-	ber_get_int		@102
-	ber_get_stringb		@103
-	ber_get_stringa		@104
-	ber_get_stringal		@105
-	ber_get_bitstringa		@106
-	ber_get_null		@107
-	ber_get_boolean		@108
-	ber_first_element		@109
-	ber_next_element		@110
-	ber_scanf		@111
-	ber_bvfree		@112
-	ber_bvecfree		@113
-	ber_put_int		@114
-	ber_put_ostring		@115
-	ber_put_string		@116
-	ber_put_bitstring		@117
-	ber_put_null		@118
-	ber_put_boolean		@119
-	ber_start_seq		@120
-	ber_start_set		@121
-	ber_put_seq		@122
-	ber_put_set		@123
-	ber_printf		@124
-	ber_read		@125
-	ber_write		@126
-	ber_free		@127
-	ber_flush		@128
-	ber_alloc		@129
-	ber_dup		@130
-	ber_get_next		@131
-	ber_get_tag		@132
-	ber_put_enum		@133
-	der_alloc		@134
-	ber_alloc_t		@135
-	ber_bvdup		@136
-	ber_init_w_nullchar		@137
-	ber_reset		@138
-	ber_get_option		@139
-	ber_set_option		@140
-	ber_sockbuf_alloc		@141
-	ber_sockbuf_get_option		@142
-	ber_sockbuf_set_option		@143
-	ber_init		@144
-	ber_flatten		@145
-	ber_special_alloc		@146
-	ber_special_free		@147
-	ber_get_next_buffer		@148
-	ber_err_print		@149
-	ber_sockbuf_free		@150
-	ber_get_next_buffer_ext		@151
-	ber_svecfree		@152
-	ber_get_buf_datalen		@153
-	ber_get_buf_databegin		@154
-	ber_stack_init		@155
-	ber_sockbuf_free_data		@156
+    ldap_is_ldap_url
+    ldap_free_urldesc
+    ldap_url_parse
+    ldap_url_search
+    ldap_url_search_s
+    ldap_url_search_st
+    ldap_set_rebind_proc
+    ber_skip_tag
+    ber_peek_tag
+    ber_get_int
+    ber_get_stringb
+    ber_get_stringa
+    ber_get_stringal
+    ber_get_bitstringa
+    ber_get_null
+    ber_get_boolean
+    ber_first_element
+    ber_next_element
+    ber_scanf
+    ber_bvfree
+    ber_bvecfree
+    ber_put_int
+    ber_put_ostring
+    ber_put_string
+    ber_put_bitstring
+    ber_put_null
+    ber_put_boolean
+    ber_start_seq
+    ber_start_set
+    ber_put_seq
+    ber_put_set
+    ber_printf
+    ber_read
+    ber_write
+    ber_free
+    ber_flush
+    ber_alloc
+    ber_dup
+    ber_get_next
+    ber_get_tag
+    ber_put_enum
+    der_alloc
+    ber_alloc_t
+    ber_bvdup
+    ber_init_w_nullchar
+    ber_reset
+    ber_get_option
+    ber_set_option
+    ber_sockbuf_alloc
+    ber_sockbuf_get_option
+    ber_sockbuf_set_option
+    ber_init
+    ber_flatten
+    ber_special_alloc
+    ber_special_free
+    ber_get_next_buffer
+    ber_err_print
+    ber_sockbuf_free
+    ber_get_next_buffer_ext
+    ber_svecfree
+    ber_get_buf_datalen
+    ber_get_buf_databegin
+    ber_stack_init
+    ber_sockbuf_free_data
 
-	ldap_memfree		@200
-	ldap_ber_free		@201
+    ldap_memfree
+    ldap_ber_free
 
-	ldap_init_searchprefs		@300
-	ldap_init_searchprefs_buf		@301
-	ldap_free_searchprefs		@302
-	ldap_first_searchobj		@303
-	ldap_next_searchobj		@304
-	ldap_build_filter		@305
+    ldap_init_searchprefs
+    ldap_init_searchprefs_buf
+    ldap_free_searchprefs
+    ldap_first_searchobj
+    ldap_next_searchobj
+    ldap_build_filter
 
-	ldap_init_templates		@400
-	ldap_init_templates_buf		@401
-	ldap_free_templates		@402
-	ldap_first_disptmpl		@403
-	ldap_next_disptmpl		@404
-	ldap_oc2template		@405
-	ldap_tmplattrs		@406
-	ldap_first_tmplrow		@407
-	ldap_next_tmplrow		@408
-	ldap_first_tmplcol		@409
-	ldap_next_tmplcol		@410
-	ldap_entry2text_search		@411
-	ldap_entry2text		@412
-	ldap_vals2text		@413
-	ldap_entry2html		@414
-	ldap_entry2html_search		@415
-	ldap_vals2html		@416
-	ldap_tmplerr2string		@417
-	ldap_set_option		@418
-	ldap_get_option		@419
-	ldap_charray_merge		@420
-	ldap_get_lderrno		@430
-	ldap_set_lderrno		@431
-	ldap_perror		@432
-	ldap_set_filter_additions		@433
-	ldap_create_filter		@434
-	ldap_version		@440
-	ldap_multisort_entries		@441
-	ldap_msgid		@442
-	ldap_explode_rdn		@443
-	ldap_msgtype		@444
-	ldap_cache_flush		@445
-	ldap_str2charray		@446
-	ldap_charray_add		@447
-	ldap_charray_dup		@448
-	ldap_charray_free		@449
+    ldap_init_templates
+    ldap_init_templates_buf
+    ldap_free_templates
+    ldap_first_disptmpl
+    ldap_next_disptmpl
+    ldap_oc2template
+    ldap_tmplattrs
+    ldap_first_tmplrow
+    ldap_next_tmplrow
+    ldap_first_tmplcol
+    ldap_next_tmplcol
+    ldap_entry2text_search
+    ldap_entry2text
+    ldap_vals2text
+    ldap_entry2html
+    ldap_entry2html_search
+    ldap_vals2html
+    ldap_tmplerr2string
+    ldap_set_option
+    ldap_get_option
+    ldap_charray_merge
+    ldap_get_lderrno
+    ldap_set_lderrno
+    ldap_perror
+    ldap_set_filter_additions
+    ldap_create_filter
+    ldap_version
+    ldap_multisort_entries
+    ldap_msgid
+    ldap_explode_rdn
+    ldap_msgtype
+    ldap_cache_flush
+    ldap_str2charray
+    ldap_charray_add
+    ldap_charray_dup
+    ldap_charray_free
 
 ;  Windows ordinals 450-469 are reserved for SSL routines
 
-	ldap_charray_inlist		@470
-	ldap_charray_position		@471
-	ldap_rename		@472
-	ldap_rename_s		@473
-	ldap_utf8len		@474
-	ldap_utf8next		@475
-	ldap_utf8prev		@476
-	ldap_utf8copy		@477
-	ldap_utf8characters		@478
-	ldap_utf8strtok_r		@479
-	ldap_utf8isalnum		@480
-	ldap_utf8isalpha		@481
-	ldap_utf8isdigit		@482
-	ldap_utf8isxdigit		@483
-	ldap_utf8isspace		@484
-	ldap_control_free		@485
-	ldap_controls_free		@486
-	ldap_sasl_bind		@487
-	ldap_sasl_bind_s		@488
-	ldap_parse_sasl_bind_result		@489
-	ldap_sasl_interactive_bind_s		@490
-	ldap_sasl_interactive_bind_ext_s		@491
+    ldap_charray_inlist
+    ldap_charray_position
+    ldap_rename
+    ldap_rename_s
+    ldap_utf8len
+    ldap_utf8next
+    ldap_utf8prev
+    ldap_utf8copy
+    ldap_utf8characters
+    ldap_utf8strtok_r
+    ldap_utf8isalnum
+    ldap_utf8isalpha
+    ldap_utf8isdigit
+    ldap_utf8isxdigit
+    ldap_utf8isspace
+    ldap_control_free
+    ldap_controls_free
+    ldap_sasl_bind
+    ldap_sasl_bind_s
+    ldap_parse_sasl_bind_result
+    ldap_sasl_interactive_bind_s
+    ldap_sasl_interactive_bind_ext_s
 ;  LDAPv3 simple paging controls are not supported by Netscape at this time.
-;  490	ldap_create_page_control
-;  491	ldap_parse_page_control
-	ldap_create_sort_control		@492
-	ldap_parse_sort_control		@493
+;  490    ldap_create_page_control
+;  491    ldap_parse_page_control
+    ldap_create_sort_control
+    ldap_parse_sort_control
 ;  an LDAPv3 language control was proposed but then retracted.
-;  494	ldap_create_language_control
-	ldap_get_lang_values		@495
-	ldap_get_lang_values_len		@496
-	ldap_free_sort_keylist		@497
-	ldap_create_sort_keylist		@498
-	ldap_utf8getcc		@499
-	ldap_get_entry_controls		@500
-	ldap_create_persistentsearch_control		@501
-	ldap_parse_entrychange_control		@502
-	ldap_parse_result		@503
-	ldap_parse_extended_result		@504
-	ldap_parse_reference		@505
-	ldap_abandon_ext		@506
-	ldap_add_ext		@507
-	ldap_add_ext_s		@508
-	ldap_modify_ext		@509
-	ldap_modify_ext_s		@510
-	ldap_first_message		@511
-	ldap_next_message		@512
-	ldap_compare_ext		@513
-	ldap_compare_ext_s		@514
-	ldap_delete_ext		@515
-	ldap_delete_ext_s		@516
-	ldap_search_ext		@517
-	ldap_search_ext_s		@518
-	ldap_extended_operation		@519
-	ldap_extended_operation_s		@520
-	ldap_first_reference		@521
-	ldap_next_reference		@522
-	ldap_count_references		@523
-	ldap_count_messages		@524
-	ldap_create_virtuallist_control		@525
-	ldap_parse_virtuallist_control		@526
-	ldap_create_proxyauth_control		@527
-	ldap_unbind_ext		@528
-	ldap_x_hostlist_first		@529
-	ldap_x_hostlist_next		@530
-	ldap_x_hostlist_statusfree		@531
-	ldap_x_malloc		@532
-	ldap_x_calloc		@533
-	ldap_x_realloc		@534
-	ldap_x_free		@535
-; 
-	ldap_create_proxiedauth_control		@536
-; 
-	ldap_create_geteffectiveRights_control		@537
-; 
-	ldap_find_control		@538
-; 
-	ldap_url_parse_no_defaults		@539
-; 
-	ldap_create_userstatus_control		@550
-	ldap_parse_userstatus_control		@551
-; 
-	ldap_create_passwordpolicy_control		@560
-	ldap_create_passwordpolicy_control_ext		@561
-	ldap_parse_passwordpolicy_control		@562
-	ldap_parse_passwordpolicy_control_ext		@563
-	ldap_passwordpolicy_err2txt		@564
-; 
-	ldap_passwd		@570
-	ldap_parse_passwd		@571
-	ldap_passwd_s		@573
-; 
-	ldap_delete_result_entry		@580
-	ldap_add_result_entry		@581
-; 
-	ldap_whoami		@590
-	ldap_parse_whoami		@591
-	ldap_whoami_s		@592
-; 
-	ldap_create_authzid_control		@600
-	ldap_parse_authzid_control		@601
-; 
-	ldap_memcache_init		@1000
-	ldap_memcache_set		@1001
-	ldap_memcache_get		@1002
-	ldap_memcache_flush		@1003
-	ldap_memcache_destroy		@1004
-	ldap_memcache_update		@1005
-	ldap_keysort_entries		@1006
-; 
+;  494    ldap_create_language_control
+    ldap_get_lang_values
+    ldap_get_lang_values_len
+    ldap_free_sort_keylist
+    ldap_create_sort_keylist
+    ldap_utf8getcc
+    ldap_get_entry_controls
+    ldap_create_persistentsearch_control
+    ldap_parse_entrychange_control
+    ldap_parse_result
+    ldap_parse_extended_result
+    ldap_parse_reference
+    ldap_abandon_ext
+    ldap_add_ext
+    ldap_add_ext_s
+    ldap_modify_ext
+    ldap_modify_ext_s
+    ldap_first_message
+    ldap_next_message
+    ldap_compare_ext
+    ldap_compare_ext_s
+    ldap_delete_ext
+    ldap_delete_ext_s
+    ldap_search_ext
+    ldap_search_ext_s
+    ldap_extended_operation
+    ldap_extended_operation_s
+    ldap_first_reference
+    ldap_next_reference
+    ldap_count_references
+    ldap_count_messages
+    ldap_create_virtuallist_control
+    ldap_parse_virtuallist_control
+    ldap_create_proxyauth_control
+    ldap_unbind_ext
+    ldap_x_hostlist_first
+    ldap_x_hostlist_next
+    ldap_x_hostlist_statusfree
+    ldap_x_malloc
+    ldap_x_calloc
+    ldap_x_realloc
+    ldap_x_free
+;
+    ldap_create_proxiedauth_control
+;
+    ldap_create_geteffectiveRights_control
+;
+    ldap_find_control
+;
+    ldap_url_parse_no_defaults
+;
+    ldap_create_userstatus_control
+    ldap_parse_userstatus_control
+;
+    ldap_create_passwordpolicy_control
+    ldap_create_passwordpolicy_control_ext
+    ldap_parse_passwordpolicy_control
+    ldap_parse_passwordpolicy_control_ext
+    ldap_passwordpolicy_err2txt
+;
+    ldap_passwd
+    ldap_parse_passwd
+    ldap_passwd_s
+;
+    ldap_delete_result_entry
+    ldap_add_result_entry
+;
+    ldap_whoami
+    ldap_parse_whoami
+    ldap_whoami_s
+;
+    ldap_create_authzid_control
+    ldap_parse_authzid_control
+;
+    ldap_memcache_init
+    ldap_memcache_set
+    ldap_memcache_get
+    ldap_memcache_flush
+    ldap_memcache_destroy
+    ldap_memcache_update
+    ldap_keysort_entries
+;
 ; end of generated exports list.
--- a/ldap/c-sdk/libraries/libldif/libldif.def
+++ b/ldap/c-sdk/libraries/libldif/libldif.def
@@ -1,63 +1,58 @@
-;
-; ***** BEGIN LICENSE BLOCK *****
-; Version: MPL 1.1/GPL 2.0/LGPL 2.1
-; 
-; The contents of this file are subject to the Mozilla Public License Version 
-; 1.1 (the "License"); you may not use this file except in compliance with 
-; the License. You may obtain a copy of the License at 
-; http://www.mozilla.org/MPL/
-; 
-; Software distributed under the License is distributed on an "AS IS" basis,
-; WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-; for the specific language governing rights and limitations under the
-; License.
-; 
-; The Original Code is Mozilla Communicator client code.
-; 
-; The Initial Developer of the Original Code is
-; Netscape Communications Corporation.
-; Portions created by the Initial Developer are Copyright (C) 1996-1999
-; the Initial Developer. All Rights Reserved.
-; 
-; Contributor(s):
-; 
-; Alternatively, the contents of this file may be used under the terms of
-; either of the GNU General Public License Version 2 or later (the "GPL"),
-; or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-; in which case the provisions of the GPL or the LGPL are applicable instead
-; of those above. If you wish to allow use of your version of this file only
-; under the terms of either the GPL or the LGPL, and not to allow others to
-; use your version of this file under the terms of the MPL, indicate your
-; decision by deleting the provisions above and replace them with the notice
-; and other provisions required by the GPL or the LGPL. If you do not delete
-; the provisions above, a recipient may use your version of this file under
-; the terms of any one of the MPL, the GPL or the LGPL.
-; 
-; ***** END LICENSE BLOCK ***** 
-
-LIBRARY         LDIF60
-DESCRIPTION     'Lightweight Directory Access Protocol LDIF Client API for 32-bit Windows'
-VERSION		6.0
-HEAPSIZE        4096
-
-EXPORTS
-; we need to manually assign ordinal numbers so we can add new routines
-; and not disturb the ordinals and thus not require callers to relink.
-; 
-; exports list (generated by genexports.pl)
-; 
-
-	ldif_parse_line		@3001
-	ldif_getline		@3002
-	ldif_put_type_and_value		@3003
-	ldif_put_type_and_value_nowrap		@3004
-	ldif_put_type_and_value_with_options		@3005
-	ldif_type_and_value		@3006
-	ldif_type_and_value_nowrap		@3007
-	ldif_type_and_value_with_options		@3008
-	ldif_base64_decode		@3009
-	ldif_base64_encode		@3010
-	ldif_base64_encode_nowrap		@3011
-	ldif_get_entry		@3012
-; 
-; end of generated exports list.
+;
+; ***** BEGIN LICENSE BLOCK *****
+; Version: MPL 1.1/GPL 2.0/LGPL 2.1
+;
+; The contents of this file are subject to the Mozilla Public License Version
+; 1.1 (the "License"); you may not use this file except in compliance with
+; the License. You may obtain a copy of the License at
+; http://www.mozilla.org/MPL/
+;
+; Software distributed under the License is distributed on an "AS IS" basis,
+; WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+; for the specific language governing rights and limitations under the
+; License.
+;
+; The Original Code is Mozilla Communicator client code.
+;
+; The Initial Developer of the Original Code is
+; Netscape Communications Corporation.
+; Portions created by the Initial Developer are Copyright (C) 1996-1999
+; the Initial Developer. All Rights Reserved.
+;
+; Contributor(s):
+;
+; Alternatively, the contents of this file may be used under the terms of
+; either of the GNU General Public License Version 2 or later (the "GPL"),
+; or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+; in which case the provisions of the GPL or the LGPL are applicable instead
+; of those above. If you wish to allow use of your version of this file only
+; under the terms of either the GPL or the LGPL, and not to allow others to
+; use your version of this file under the terms of the MPL, indicate your
+; decision by deleting the provisions above and replace them with the notice
+; and other provisions required by the GPL or the LGPL. If you do not delete
+; the provisions above, a recipient may use your version of this file under
+; the terms of any one of the MPL, the GPL or the LGPL.
+;
+; ***** END LICENSE BLOCK *****
+
+LIBRARY         LDIF60
+VERSION         6.0
+HEAPSIZE        4096
+
+EXPORTS
+; exports list (generated by genexports.pl)
+;
+    ldif_parse_line
+    ldif_getline
+    ldif_put_type_and_value
+    ldif_put_type_and_value_nowrap
+    ldif_put_type_and_value_with_options
+    ldif_type_and_value
+    ldif_type_and_value_nowrap
+    ldif_type_and_value_with_options
+    ldif_base64_decode
+    ldif_base64_encode
+    ldif_base64_encode_nowrap
+    ldif_get_entry
+;
+; end of generated exports list.
--- a/ldap/c-sdk/libraries/libprldap/libprldap.def
+++ b/ldap/c-sdk/libraries/libprldap/libprldap.def
@@ -1,63 +1,59 @@
 ;
 ; ***** BEGIN LICENSE BLOCK *****
 ; Version: MPL 1.1/GPL 2.0/LGPL 2.1
-; 
-; The contents of this file are subject to the Mozilla Public License Version 
-; 1.1 (the "License"); you may not use this file except in compliance with 
-; the License. You may obtain a copy of the License at 
+;
+; The contents of this file are subject to the Mozilla Public License Version
+; 1.1 (the "License"); you may not use this file except in compliance with
+; the License. You may obtain a copy of the License at
 ; http://www.mozilla.org/MPL/
-; 
+;
 ; Software distributed under the License is distributed on an "AS IS" basis,
 ; WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
 ; for the specific language governing rights and limitations under the
 ; License.
-; 
+;
 ; The Original Code is Mozilla Communicator client code.
-; 
+;
 ; The Initial Developer of the Original Code is
 ; Netscape Communications Corporation.
 ; Portions created by the Initial Developer are Copyright (C) 1996-1999
 ; the Initial Developer. All Rights Reserved.
-; 
+;
 ; Contributor(s):
-; 
+;
 ; Alternatively, the contents of this file may be used under the terms of
 ; either of the GNU General Public License Version 2 or later (the "GPL"),
 ; or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
 ; in which case the provisions of the GPL or the LGPL are applicable instead
 ; of those above. If you wish to allow use of your version of this file only
 ; under the terms of either the GPL or the LGPL, and not to allow others to
 ; use your version of this file under the terms of the MPL, indicate your
 ; decision by deleting the provisions above and replace them with the notice
 ; and other provisions required by the GPL or the LGPL. If you do not delete
 ; the provisions above, a recipient may use your version of this file under
 ; the terms of any one of the MPL, the GPL or the LGPL.
-; 
-; ***** END LICENSE BLOCK ***** 
+;
+; ***** END LICENSE BLOCK *****
 
 LIBRARY         PRLDAP60
-DESCRIPTION     'LDAP to NSPR glue library for 32-bit Windows'
-VERSION		6.0
+VERSION         6.0
 HEAPSIZE        4096
 
 EXPORTS
-; we need to manually assign ordinal numbers so we can add new routines
-; and not disturb the ordinals and thus not require callers to relink.
-; 
 ; exports list (generated by genexports.pl)
-; 
+;
 
-	prldap_init		@2010
-	prldap_install_routines		@2011
-	prldap_set_session_info		@2012
-	prldap_get_session_info		@2013
-	prldap_set_socket_info		@2014
-	prldap_get_socket_info		@2015
-	prldap_set_session_option		@2016
-	prldap_get_session_option		@2017
-	prldap_is_installed		@2018
-	prldap_import_connection		@2019
-	prldap_set_default_socket_info		@2020
-	prldap_get_default_socket_info		@2021
-; 
+    prldap_init
+    prldap_install_routines
+    prldap_set_session_info
+    prldap_get_session_info
+    prldap_set_socket_info
+    prldap_get_socket_info
+    prldap_set_session_option
+    prldap_get_session_option
+    prldap_is_installed
+    prldap_import_connection
+    prldap_set_default_socket_info
+    prldap_get_default_socket_info
+;
 ; end of generated exports list.
--- a/mailnews/mapi/mapiDll/Mapi32.DEF
+++ b/mailnews/mapi/mapiDll/Mapi32.DEF
@@ -1,20 +1,19 @@
 ; This Source Code Form is subject to the terms of the Mozilla Public
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 LIBRARY         mozMapi32.dll
-DESCRIPTION     'Mozilla Simple MAPI Support'
 
 EXPORTS
         MAPILogon
         MAPILogoff
-	MAPISendMail
-	MAPISendDocuments
+        MAPISendMail
+        MAPISendDocuments
         MAPIFindNext
         MAPIReadMail
         MAPISaveMail
         MAPIDeleteMail
         MAPIAddress
         MAPIDetails
         MAPIResolveName
         MAPIFreeBuffer
--- a/mailnews/mapi/mapihook/build/MapiProxy.def
+++ b/mailnews/mapi/mapihook/build/MapiProxy.def
@@ -1,15 +1,13 @@
 ; This Source Code Form is subject to the terms of the Mozilla Public
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 LIBRARY         MapiProxy.dll
-DESCRIPTION     'Proxy/Stub DLL'
 
 EXPORTS
-                DllGetClassObject   @1  PRIVATE
-                DllCanUnloadNow     @2  PRIVATE
-                GetProxyDllInfo     @3  PRIVATE
-                DllRegisterServer   @4  PRIVATE
-                DllUnregisterServer @5  PRIVATE
+                DllGetClassObject    PRIVATE
+                DllCanUnloadNow      PRIVATE
+                GetProxyDllInfo      PRIVATE
+                DllRegisterServer    PRIVATE
+                DllUnregisterServer  PRIVATE
 
-