include/close_code.h
author Sam Lantinga <slouken@libsdl.org>
Mon, 28 Aug 2017 09:41:00 -0700
changeset 11390 8244c62d8fbc
parent 10737 3406a0f8b041
child 11811 5d94cb6b24d3
permissions -rw-r--r--
Fixed bug 3781 - unbalanced #pragma pack(pop) in close_code.h

Ozkan Sezer

Revision 288 (http://hg.libsdl.org/SDL/rev/2f5a6062db86) excluded the
Watcom compiler from forcing 4 byte structure packing in begin_code.h.
However, it missed updating close_code.h, which now has an unbalanced
#pragma pack(pop) if the compiler is Watcom. The issue seems to have
crawled into SDL2, too.
slouken@0
     1
/*
slouken@5535
     2
  Simple DirectMedia Layer
slouken@10737
     3
  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
slouken@0
     4
slouken@5535
     5
  This software is provided 'as-is', without any express or implied
slouken@5535
     6
  warranty.  In no event will the authors be held liable for any damages
slouken@5535
     7
  arising from the use of this software.
slouken@0
     8
slouken@5535
     9
  Permission is granted to anyone to use this software for any purpose,
slouken@5535
    10
  including commercial applications, and to alter it and redistribute it
slouken@5535
    11
  freely, subject to the following restrictions:
slouken@0
    12
slouken@5535
    13
  1. The origin of this software must not be misrepresented; you must not
slouken@5535
    14
     claim that you wrote the original software. If you use this software
slouken@5535
    15
     in a product, an acknowledgment in the product documentation would be
slouken@5535
    16
     appreciated but is not required.
slouken@5535
    17
  2. Altered source versions must be plainly marked as such, and must not be
slouken@5535
    18
     misrepresented as being the original software.
slouken@5535
    19
  3. This notice may not be removed or altered from any source distribution.
slouken@0
    20
*/
slouken@0
    21
slouken@3407
    22
/**
slouken@3407
    23
 *  \file close_code.h
slouken@7191
    24
 *
slouken@3407
    25
 *  This file reverses the effects of begin_code.h and should be included
slouken@3407
    26
 *  after you finish any function and structure declarations in your headers
slouken@3407
    27
 */
slouken@0
    28
slouken@0
    29
#undef _begin_code_h
slouken@0
    30
slouken@0
    31
/* Reset structure packing at previous byte alignment */
slouken@11390
    32
#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__)
slouken@0
    33
#ifdef __BORLANDC__
slouken@0
    34
#pragma nopackwarning
slouken@0
    35
#endif
slouken@0
    36
#pragma pack(pop)
slouken@0
    37
#endif /* Compiler needs structure packing set */