include/close_code.h
author Sam Lantinga <slouken@libsdl.org>
Mon, 28 Aug 2017 09:38:12 -0700
branchSDL-1.2
changeset 11389 2c67e7e5a106
parent 6137 4720145f848b
child 11966 0c7962a4336f
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@0
     2
    SDL - Simple DirectMedia Layer
slouken@6137
     3
    Copyright (C) 1997-2012 Sam Lantinga
slouken@0
     4
slouken@0
     5
    This library is free software; you can redistribute it and/or
slouken@0
     6
    modify it under the terms of the GNU Library General Public
slouken@0
     7
    License as published by the Free Software Foundation; either
slouken@0
     8
    version 2 of the License, or (at your option) any later version.
slouken@0
     9
slouken@0
    10
    This library is distributed in the hope that it will be useful,
slouken@0
    11
    but WITHOUT ANY WARRANTY; without even the implied warranty of
slouken@0
    12
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
slouken@0
    13
    Library General Public License for more details.
slouken@0
    14
slouken@0
    15
    You should have received a copy of the GNU Library General Public
slouken@0
    16
    License along with this library; if not, write to the Free
slouken@0
    17
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
slouken@0
    18
slouken@0
    19
    Sam Lantinga
slouken@251
    20
    slouken@libsdl.org
slouken@0
    21
*/
slouken@0
    22
slouken@4217
    23
/**
slouken@4217
    24
 *  @file close_code.h
slouken@4217
    25
 *  This file reverses the effects of begin_code.h and should be included
slouken@4217
    26
 *  after you finish any function and structure declarations in your headers
slouken@4217
    27
 */
slouken@0
    28
slouken@0
    29
#undef _begin_code_h
slouken@0
    30
slouken@4217
    31
/**
slouken@4217
    32
 *  @file close_code.h
slouken@4217
    33
 *  Reset structure packing at previous byte alignment
slouken@4217
    34
 */
slouken@11389
    35
#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__)
slouken@0
    36
#ifdef __BORLANDC__
slouken@0
    37
#pragma nopackwarning
slouken@0
    38
#endif
slouken@1402
    39
#if (defined(__MWERKS__) && defined(__MACOS__))
slouken@189
    40
#pragma options align=reset
slouken@189
    41
#pragma enumsalwaysint reset
slouken@189
    42
#else
slouken@0
    43
#pragma pack(pop)
slouken@189
    44
#endif
slouken@0
    45
#endif /* Compiler needs structure packing set */
slouken@0
    46