The Tor Browser / file diff

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/security/nss/cmd/tests/conflict.c	Wed Dec 31 06:09:35 2014 +0100
     1.3 @@ -0,0 +1,26 @@
     1.4 +/* This Source Code Form is subject to the terms of the Mozilla Public
     1.5 + * License, v. 2.0. If a copy of the MPL was not distributed with this
     1.6 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
     1.7 +
     1.8 +/*
     1.9 + * This test verifies that NSS public headers don't conflict with common
    1.10 + * identifier names.
    1.11 + */
    1.12 +
    1.13 +#include "nssilckt.h"
    1.14 +
    1.15 +/*
    1.16 + * Bug 455424: nssilckt.h used to define the enumeration constant 'Lock',
    1.17 + * which conflicts with C++ code that defines a Lock class.  This is a
    1.18 + * reduced test case in C for that name conflict.
    1.19 + */
    1.20 +typedef struct {
    1.21 +    int dummy;
    1.22 +} Lock;
    1.23 +
    1.24 +Lock lock;
    1.25 +
    1.26 +int main()
    1.27 +{
    1.28 +    return 0;
    1.29 +}