Commit 6fb4f152 authored by GnoStiC's avatar GnoStiC

puae 2.3.1

parent c64ca435
# P-UAE # P-UAE
# #
# 2010 Mustafa TUFAN (aka GnoStiC/BRONX) # 2006-2011 Mustafa TUFAN (aka GnoStiC/BRONX)
# #
# this is the main script to build (and test) PUAE # this is the main script to build (and test) PUAE
# #
......
# P-UAE # P-UAE
# #
# 2010 Mustafa TUFAN (aka GnoStiC/BRONX) # 2006-2011 Mustafa TUFAN (aka GnoStiC/BRONX)
# #
# #
# #
......
# P-UAE # P-UAE
# #
# 2010 Mustafa TUFAN (aka GnoStiC/BRONX) # 2006-2011 Mustafa TUFAN (aka GnoStiC/BRONX)
# #
# #
# #
......
# P-UAE # P-UAE
# #
# 2010 Mustafa TUFAN (aka GnoStiC/BRONX) # 2006-2011 Mustafa TUFAN (aka GnoStiC/BRONX)
# #
# #
# #
......
# P-UAE # P-UAE
# #
# 2010 Mustafa TUFAN (aka GnoStiC/BRONX) # 2006-2011 Mustafa TUFAN (aka GnoStiC/BRONX)
# #
# #
# #
......
# P-UAE # P-UAE
# #
# 2010 Mustafa TUFAN (aka GnoStiC/BRONX) # 2006-2011 Mustafa TUFAN (aka GnoStiC/BRONX)
# #
# #
# #
......
# P-UAE # P-UAE
# #
# 2010 Mustafa TUFAN (aka GnoStiC/BRONX) # 2006-2011 Mustafa TUFAN (aka GnoStiC/BRONX)
#
# #
# this is the main script to build (and test) PUAE
# #
base=" --with-sdl --with-sdl-gfx --with-sdl-sound --enable-drvsnd " base=" --with-sdl --with-sdl-gfx --with-sdl-sound --enable-drvsnd "
glgl=" --with-sdl-gl " glgl=" --with-sdl-gl "
......
...@@ -6,7 +6,7 @@ dnl Updated and generally mauled 2008-2011 Mustafa Tufan ...@@ -6,7 +6,7 @@ dnl Updated and generally mauled 2008-2011 Mustafa Tufan
dnl dnl
AC_PREREQ(2.55) AC_PREREQ(2.55)
AC_INIT(PUAE, 2.3.1, ,puae) AC_INIT(PUAE, 2.3.1, 'mustafa.tufan@gmail.com', puae)
AC_CONFIG_SRCDIR([bootstrap.sh]) AC_CONFIG_SRCDIR([bootstrap.sh])
AM_CONFIG_HEADER([src/sysconfig.h]) AM_CONFIG_HEADER([src/sysconfig.h])
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
...@@ -55,6 +55,15 @@ dnl AC_CHECK_LIB(vga, vga_setmode, HAVE_SVGA_LIB=yes, HAVE_SVGA_LIB=no) ...@@ -55,6 +55,15 @@ dnl AC_CHECK_LIB(vga, vga_setmode, HAVE_SVGA_LIB=yes, HAVE_SVGA_LIB=no)
AC_CHECK_LIB(ossaudio,_oss_ioctl, HAVE_LIBOSSAUDIO=yes, HAVE_LIBOSSAUDIO=no) AC_CHECK_LIB(ossaudio,_oss_ioctl, HAVE_LIBOSSAUDIO=yes, HAVE_LIBOSSAUDIO=no)
dnl
dnl commit version
dnl
commit=`tail -1 .git/packed-refs | awk '{print $1}'`
if test -z "$commit"; then
commit="not git"
fi
AC_DEFINE_UNQUOTED(PACKAGE_COMMIT, "$commit", [cloned git commit version])
dnl dnl
dnl Prefer Gtk2.x over Gtk1.x if both are available dnl Prefer Gtk2.x over Gtk1.x if both are available
dnl dnl
...@@ -676,6 +685,10 @@ AC_ARG_WITH(sdl-gl, ...@@ -676,6 +685,10 @@ AC_ARG_WITH(sdl-gl,
AS_HELP_STRING([--with-sdl-gl], [Allow GL for 2D acceleration with SDL graphics]), AS_HELP_STRING([--with-sdl-gl], [Allow GL for 2D acceleration with SDL graphics]),
[WANT_SDLGL=$withval], []) [WANT_SDLGL=$withval], [])
AC_ARG_WITH(cocoa-gfx,
AS_HELP_STRING([--with-cocoa-gfx], [Use Cocoa library for graphics]),
[WANT_COCOAGFX=$withval], [])
AC_ARG_WITH(qt, AC_ARG_WITH(qt,
AS_HELP_STRING([--with-qt], [Use QT library for graphics/ui]), AS_HELP_STRING([--with-qt], [Use QT library for graphics/ui]),
[WANT_QT=$withval], []) [WANT_QT=$withval], [])
...@@ -990,6 +1003,15 @@ if [[ "x$WANT_SDL" = "xyes" -o "x$GFX_DEP" = "x" ]]; then ...@@ -990,6 +1003,15 @@ if [[ "x$WANT_SDL" = "xyes" -o "x$GFX_DEP" = "x" ]]; then
fi fi
fi fi
dnl
if [[ "x$WANT_COCOAGFX" = "xyes" ]]; then
GFX_DEP=gfx-cocoa
GFX_NAME=COCOA
GFX_LIBS=""
GFX_CFLAGS=""
GFX_CPPFLAGS=""
GFX_LIBS="-framework OpenGL"
fi
dnl If we got here and we still haven't found a graphics target dnl If we got here and we still haven't found a graphics target
dnl then bail out. dnl then bail out.
...@@ -1957,7 +1979,7 @@ AC_CONFIG_FILES([Makefile ...@@ -1957,7 +1979,7 @@ AC_CONFIG_FILES([Makefile
src/gfx-x11/Makefile src/gfx-x11/Makefile
src/gfx-sdl/Makefile src/gfx-sdl/Makefile
src/gfx-curses/Makefile src/gfx-curses/Makefile
src/gfx-svga/Makefile src/gfx-cocoa/Makefile
src/sd-alsa/Makefile src/sd-alsa/Makefile
src/sd-amigaos/Makefile src/sd-amigaos/Makefile
src/sd-beos/Makefile src/sd-beos/Makefile
......
# P-UAE # P-UAE
# #
# 2010 Mustafa TUFAN # 2006-2011 Mustafa TUFAN
# #
# this script cleans up various files so that we don't push unnecessary files to git.. # this script cleans up various files so that we don't push unnecessary files to git..
# #
...@@ -43,6 +43,7 @@ rm -rf src/gfx-curses/Makefile.in ...@@ -43,6 +43,7 @@ rm -rf src/gfx-curses/Makefile.in
rm -rf src/gfx-sdl/Makefile.in rm -rf src/gfx-sdl/Makefile.in
rm -rf src/gfx-svga/Makefile.in rm -rf src/gfx-svga/Makefile.in
rm -rf src/gfx-x11/Makefile.in rm -rf src/gfx-x11/Makefile.in
rm -rf src/gfx-cocoa/Makefile.in
rm -rf src/gui-beos/Makefile.in rm -rf src/gui-beos/Makefile.in
rm -rf src/gui-cocoa/Makefile.in rm -rf src/gui-cocoa/Makefile.in
rm -rf src/gui-gtk/Makefile.in rm -rf src/gui-gtk/Makefile.in
......
...@@ -27,7 +27,7 @@ SUBDIRS = \ ...@@ -27,7 +27,7 @@ SUBDIRS = \
DIST_SUBDIRS = \ DIST_SUBDIRS = \
md-generic md-68k md-i386-gcc md-ppc md-ppc-gcc md-amd64-gcc \ md-generic md-68k md-i386-gcc md-ppc md-ppc-gcc md-amd64-gcc \
gfx-amigaos gfx-beos gfx-x11 gfx-sdl gfx-curses gfx-svga \ gfx-amigaos gfx-beos gfx-x11 gfx-sdl gfx-curses gfx-svga gfx-cocoa \
sd-none sd-alsa sd-amigaos sd-beos sd-sdl sd-solaris sd-uss \ sd-none sd-alsa sd-amigaos sd-beos sd-sdl sd-solaris sd-uss \
jd-none jd-amigainput jd-amigaos jd-beos jd-linuxold jd-sdl \ jd-none jd-amigainput jd-amigaos jd-beos jd-linuxold jd-sdl \
gui-none gui-beos gui-cocoa gui-gtk gui-muirexx \ gui-none gui-beos gui-cocoa gui-gtk gui-muirexx \
......
...@@ -2152,12 +2152,12 @@ int getcapslockstate (void) ...@@ -2152,12 +2152,12 @@ int getcapslockstate (void)
{ {
return SDL_GetModState() & KMOD_CAPS; return SDL_GetModState() & KMOD_CAPS;
} }
void setcapslockstate (int state) void setcapslockstate (int state)
{ {
//TODO: //TODO:
} }
/* /*
* Default inputdevice config for SDL mouse * Default inputdevice config for SDL mouse
*/ */
......
...@@ -235,40 +235,63 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull ...@@ -235,40 +235,63 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull
[self createMenuItemInMenu:vAmigaMenu withTitle:@"Select Cartridge ROM" action:@selector(selectCartridge:) tag:0]; [self createMenuItemInMenu:vAmigaMenu withTitle:@"Select Cartridge ROM" action:@selector(selectCartridge:) tag:0];
[self createMenuItemInMenu:vAmigaMenu withTitle:@"Select Flash RAM" action:@selector(selectFlashRAM:) tag:0]; [self createMenuItemInMenu:vAmigaMenu withTitle:@"Select Flash RAM" action:@selector(selectFlashRAM:) tag:0];
[vAmigaMenu addItem:[NSMenuItem separatorItem]];
// Add menu items for inserting into floppy drives 1 - 4
NSMenu *insertFloppyMenu = [[NSMenu alloc] initWithTitle:@"Insert Floppy"];
for (driveNumber=0; driveNumber<4; driveNumber++) {
[self createMenuItemInMenu:insertFloppyMenu withTitle:[NSString stringWithFormat:@"DF%d...",driveNumber] action:@selector(insertDisk:) tag:driveNumber];
}
menuItem = [[NSMenuItem alloc] initWithTitle:@"Insert Floppy" action:nil keyEquivalent:@""];
[menuItem setSubmenu:insertFloppyMenu];
[vAmigaMenu addItem:menuItem];
[menuItem release];
[insertFloppyMenu release];
// Add menu items for ejecting from floppy drives 1 - 4
NSMenu *ejectFloppyMenu = [[NSMenu alloc] initWithTitle:@"Eject Floppy"];
[self createMenuItemInMenu:ejectFloppyMenu withTitle:@"All" action:@selector(ejectAllDisks:) tag:0];
[ejectFloppyMenu addItem:[NSMenuItem separatorItem]];
for (driveNumber=0; driveNumber<4; driveNumber++) {
[self createMenuItemInMenu:ejectFloppyMenu withTitle:[NSString stringWithFormat:@"DF%d",driveNumber] action:@selector(ejectDisk:) tag:driveNumber];
}
menuItem = [[NSMenuItem alloc] initWithTitle:@"Eject Floppy" action:nil keyEquivalent:@""];
[menuItem setSubmenu:ejectFloppyMenu];
[vAmigaMenu addItem:menuItem];
[menuItem release];
[ejectFloppyMenu release];
menuItem = [[NSMenuItem alloc] initWithTitle:@"PUAE" action:nil keyEquivalent:@""]; menuItem = [[NSMenuItem alloc] initWithTitle:@"PUAE" action:nil keyEquivalent:@""];
[menuItem setSubmenu:vAmigaMenu]; [menuItem setSubmenu:vAmigaMenu];
[[NSApp mainMenu] insertItem:menuItem atIndex:1]; [[NSApp mainMenu] insertItem:menuItem atIndex:1];
[menuItem release]; [menuItem release];
[vAmigaMenu release]; [vAmigaMenu release];
// DISK MENU START
NSMenu *dskMenu = [[NSMenu alloc] initWithTitle:@"Disk"];
// Add menu items for inserting into floppy drives 1 - 4
NSMenu *insertFloppyMenu = [[NSMenu alloc] initWithTitle:@"Insert Floppy"];
for (driveNumber=0; driveNumber<4; driveNumber++) {
[self createMenuItemInMenu:insertFloppyMenu withTitle:[NSString stringWithFormat:@"DF%d...",driveNumber] action:@selector(insertDisk:) tag:driveNumber];
}
menuItem = [[NSMenuItem alloc] initWithTitle:@"Insert Floppy" action:nil keyEquivalent:@""];
[menuItem setSubmenu:insertFloppyMenu];
[dskMenu addItem:menuItem];
[menuItem release];
[dskMenu addItem:[NSMenuItem separatorItem]];
// Add menu items for ejecting from floppy drives 1 - 4
NSMenu *ejectFloppyMenu = [[NSMenu alloc] initWithTitle:@"Eject Floppy"];
[self createMenuItemInMenu:ejectFloppyMenu withTitle:@"All" action:@selector(ejectAllDisks:) tag:0];
[ejectFloppyMenu addItem:[NSMenuItem separatorItem]];
for (driveNumber=0; driveNumber<4; driveNumber++) {
[self createMenuItemInMenu:ejectFloppyMenu withTitle:[NSString stringWithFormat:@"DF%d",driveNumber] action:@selector(ejectDisk:) tag:driveNumber];
}
menuItem = [[NSMenuItem alloc] initWithTitle:@"Eject Floppy" action:nil keyEquivalent:@""];
[menuItem setSubmenu:ejectFloppyMenu];
[dskMenu addItem:menuItem];
[menuItem release];
[dskMenu addItem:[NSMenuItem separatorItem]];
NSMenu *hddMenu = [[NSMenu alloc] initWithTitle:@"Mount HDF"];
menuItem = [[NSMenuItem alloc] initWithTitle:@"Mount HDF" action:nil keyEquivalent:@""];
[menuItem setSubmenu:hddMenu];
[dskMenu addItem:menuItem];
[menuItem release];
NSMenu *vhddMenu = [[NSMenu alloc] initWithTitle:@"Mount Folder as HDD"];
menuItem = [[NSMenuItem alloc] initWithTitle:@"Mount Folder as HDD" action:nil keyEquivalent:@""];
[menuItem setSubmenu:vhddMenu];
[dskMenu addItem:menuItem];
[menuItem release];
menuItem = [[NSMenuItem alloc] initWithTitle:@"Disk" action:nil keyEquivalent:@""];
[menuItem setSubmenu:dskMenu];
[[NSApp mainMenu] insertItem:menuItem atIndex:2];
[dskMenu release];
[menuItem release];
// DISK MENU END
// MEM MENU START // MEM MENU START
NSMenu *memMenu = [[NSMenu alloc] initWithTitle:@"Memory"]; NSMenu *memMenu = [[NSMenu alloc] initWithTitle:@"Memory"];
...@@ -365,7 +388,7 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull ...@@ -365,7 +388,7 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull
menuItem = [[NSMenuItem alloc] initWithTitle:@"Memory" action:nil keyEquivalent:@""]; menuItem = [[NSMenuItem alloc] initWithTitle:@"Memory" action:nil keyEquivalent:@""];
[menuItem setSubmenu:memMenu]; [menuItem setSubmenu:memMenu];
[[NSApp mainMenu] insertItem:menuItem atIndex:2]; [[NSApp mainMenu] insertItem:menuItem atIndex:3];
[memMenu release]; [memMenu release];
[menuItem release]; [menuItem release];
// MEM MENU END // MEM MENU END
...@@ -465,7 +488,7 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull ...@@ -465,7 +488,7 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull
menuItem = [[NSMenuItem alloc] initWithTitle:@"System" action:nil keyEquivalent:@""]; menuItem = [[NSMenuItem alloc] initWithTitle:@"System" action:nil keyEquivalent:@""];
[menuItem setSubmenu:systemMenu]; [menuItem setSubmenu:systemMenu];
[[NSApp mainMenu] insertItem:menuItem atIndex:3]; [[NSApp mainMenu] insertItem:menuItem atIndex:4];
[systemMenu release]; [systemMenu release];
[menuItem release]; [menuItem release];
// SYSTEM MENU END // SYSTEM MENU END
...@@ -506,7 +529,7 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull ...@@ -506,7 +529,7 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull
menuItem = [[NSMenuItem alloc] initWithTitle:@"Sound" action:nil keyEquivalent:@""]; menuItem = [[NSMenuItem alloc] initWithTitle:@"Sound" action:nil keyEquivalent:@""];
[menuItem setSubmenu:soundMenu]; [menuItem setSubmenu:soundMenu];
[[NSApp mainMenu] insertItem:menuItem atIndex:4]; [[NSApp mainMenu] insertItem:menuItem atIndex:5];
[soundMenu release]; [soundMenu release];
[menuItem release]; [menuItem release];
// SOUND MENU END // SOUND MENU END
...@@ -559,7 +582,7 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull ...@@ -559,7 +582,7 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull
menuItem = [[NSMenuItem alloc] initWithTitle:@"Control" action:nil keyEquivalent:@""]; menuItem = [[NSMenuItem alloc] initWithTitle:@"Control" action:nil keyEquivalent:@""];
[menuItem setSubmenu:controlMenu]; [menuItem setSubmenu:controlMenu];
[[NSApp mainMenu] insertItem:menuItem atIndex:5]; [[NSApp mainMenu] insertItem:menuItem atIndex:6];
[controlMenu release]; [controlMenu release];
[menuItem release]; [menuItem release];
...@@ -569,7 +592,7 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull ...@@ -569,7 +592,7 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull
[self createMenuItemInMenu:displayMenu withTitle:@"Inhibit" action:@selector(toggleInhibitDisplay:) tag:0]; [self createMenuItemInMenu:displayMenu withTitle:@"Inhibit" action:@selector(toggleInhibitDisplay:) tag:0];
menuItem = [[NSMenuItem alloc] initWithTitle:@"Display" action:nil keyEquivalent:@""]; menuItem = [[NSMenuItem alloc] initWithTitle:@"Display" action:nil keyEquivalent:@""];
[menuItem setSubmenu:displayMenu]; [menuItem setSubmenu:displayMenu];
[[NSApp mainMenu] insertItem:menuItem atIndex:6]; [[NSApp mainMenu] insertItem:menuItem atIndex:7];
[displayMenu release]; [displayMenu release];
[menuItem release]; [menuItem release];
} }
......
...@@ -258,7 +258,7 @@ struct CLUTEntry { ...@@ -258,7 +258,7 @@ struct CLUTEntry {
#ifdef TARGET_AMIGAOS #ifdef TARGET_AMIGAOS
#include <graphics/gfx.h> #include <graphics/gfx.h>
#else #else
struct BitMap struct pBitMap
{ {
uae_u16 BytesPerRow; uae_u16 BytesPerRow;
uae_u16 Rows; uae_u16 Rows;
...@@ -363,7 +363,7 @@ struct RenderInfo { ...@@ -363,7 +363,7 @@ struct RenderInfo {
#define PSSO_Pattern_Size 16 #define PSSO_Pattern_Size 16
#define PSSO_Pattern_DrawMode 17 #define PSSO_Pattern_DrawMode 17
#define PSSO_Pattern_sizeof 18 #define PSSO_Pattern_sizeof 18
struct Pattern { struct pPattern {
uae_u8 *Memory; uae_u8 *Memory;
uae_u16 XOffset, YOffset; uae_u16 XOffset, YOffset;
uae_u32 FgPen, BgPen; uae_u32 FgPen, BgPen;
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* Need to fix this. * Need to fix this.
*/ */
#define UAEMAJOR 2 #define UAEMAJOR 2
#define UAEMINOR 3 #define UAEMINOR 3
#define UAESUBREV 1 #define UAESUBREV 1
#define UAEVERSION (256*65536L*UAEMAJOR + 65536L*UAEMINOR + UAESUBREV) #define UAEVERSION (256*65536L*UAEMAJOR + 65536L*UAEMINOR + UAESUBREV)
......
...@@ -82,27 +82,28 @@ static int oldhcounter; ...@@ -82,27 +82,28 @@ static int oldhcounter;
static void hr (void) static void hr (void)
{ {
write_log ("------------------------------------------------------------------------------------\n"); write_log ("------------------------------------------------------------------------------------\n");
} }
static void show_version (void) static void show_version (void)
{ {
write_log ("P-UAE %d.%d.%d\n", UAEMAJOR, UAEMINOR, UAESUBREV); write_log ("P-UAE %d.%d.%d\n", UAEMAJOR, UAEMINOR, UAESUBREV);
write_log ("Build date: " __DATE__ " " __TIME__ "\n"); write_log ("Git Commit: %s\n", PACKAGE_COMMIT);
write_log ("Build date: " __DATE__ " " __TIME__ "\n");
} }
static void show_version_full (void) static void show_version_full (void)
{ {
hr (); hr ();
show_version (); show_version ();
hr (); hr ();
write_log ("Copyright 1995-2002 Bernd Schmidt\n"); write_log ("Copyright 1995-2002 Bernd Schmidt\n");
write_log (" 1999-2011 Toni Wilen\n"); write_log (" 1999-2011 Toni Wilen\n");
write_log (" 2003-2007 Richard Drummond\n"); write_log (" 2003-2007 Richard Drummond\n");
write_log (" 2006-2011 Mustafa 'GnoStiC' Tufan\n\n"); write_log (" 2006-2011 Mustafa 'GnoStiC' Tufan\n\n");
write_log ("See the source for a full list of contributors.\n"); write_log ("See the source for a full list of contributors.\n");
write_log ("This is free software; see the file COPYING for copying conditions. There is NO\n"); write_log ("This is free software; see the file COPYING for copying conditions. There is NO\n");
write_log ("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"); write_log ("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n");
hr (); hr ();
} }
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<string>uaerc</string> <string>uaerc</string>
</array> </array>
<key>CFBundleTypeName</key> <key>CFBundleTypeName</key>
<string>UAE Configuration</string> <string>PUAE Configuration</string>
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key>
<string>Viewer</string> <string>Viewer</string>
</dict> </dict>
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>uae</string> <string>uae</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>euae.icns</string> <string>puae.icns</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<key>CFBundleName</key> <key>CFBundleName</key>
<string>PUAE</string> <string>PUAE</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>2.3.1</string> <string>@PACKAGE_COMMIT@</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>2.3.1</string> <string>2.3.1</string>
</dict> </dict>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<key>CFBundleName</key> <key>CFBundleName</key>
<string>@PACKAGE_NAME@</string> <string>@PACKAGE_NAME@</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>@PACKAGE_VERSION@</string> <string>@PACKAGE_COMMIT@</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>@VERSION@</string> <string>@VERSION@</string>
</dict> </dict>
......
...@@ -256,7 +256,7 @@ static TCHAR *BuildBinaryString (uae_u8 value) ...@@ -256,7 +256,7 @@ static TCHAR *BuildBinaryString (uae_u8 value)
return binary_byte; return binary_byte;
} }
static void DumpPattern (struct Pattern *patt) static void DumpPattern (struct pPattern *patt)
{ {
uae_u8 *mem; uae_u8 *mem;
int row, col; int row, col;
...@@ -372,7 +372,7 @@ static int CopyRenderInfoStructureA2U (uaecptr amigamemptr, struct RenderInfo *r ...@@ -372,7 +372,7 @@ static int CopyRenderInfoStructureA2U (uaecptr amigamemptr, struct RenderInfo *r
return 0; return 0;
} }
static int CopyPatternStructureA2U (uaecptr amigamemptr, struct Pattern *pattern) static int CopyPatternStructureA2U (uaecptr amigamemptr, struct pPattern *pattern)
{ {
uaecptr memp = get_long (amigamemptr + PSSO_Pattern_Memory); uaecptr memp = get_long (amigamemptr + PSSO_Pattern_Memory);
if (valid_address (memp, PSSO_Pattern_sizeof)) { if (valid_address (memp, PSSO_Pattern_sizeof)) {
...@@ -400,7 +400,7 @@ static void CopyColorIndexMappingA2U (uaecptr amigamemptr, struct ColorIndexMapp ...@@ -400,7 +400,7 @@ static void CopyColorIndexMappingA2U (uaecptr amigamemptr, struct ColorIndexMapp
} }
} }
static int CopyBitMapStructureA2U (uaecptr amigamemptr, struct BitMap *bm) static int CopyBitMapStructureA2U (uaecptr amigamemptr, struct pBitMap *bm)
{ {
int i; int i;
...@@ -2570,7 +2570,7 @@ STATIC_INLINE void PixelWrite (uae_u8 *mem, int bits, uae_u32 fgpen, int Bpp, ua ...@@ -2570,7 +2570,7 @@ STATIC_INLINE void PixelWrite (uae_u8 *mem, int bits, uae_u32 fgpen, int Bpp, ua
* Inputs: * Inputs:
* a0:struct BoardInfo *bi * a0:struct BoardInfo *bi
* a1:struct RenderInfo *ri * a1:struct RenderInfo *ri
* a2:struct Pattern *pattern * a2:struct pPattern *pattern
* d0.w:X * d0.w:X
* d1.w:Y * d1.w:Y
* d2.w:Width * d2.w:Width
...@@ -2598,7 +2598,7 @@ static uae_u32 REGPARAM2 picasso_BlitPattern (TrapContext *ctx) ...@@ -2598,7 +2598,7 @@ static uae_u32 REGPARAM2 picasso_BlitPattern (TrapContext *ctx)
uae_u8 Bpp = GetBytesPerPixel (RGBFmt); uae_u8 Bpp = GetBytesPerPixel (RGBFmt);
int inversion = 0; int inversion = 0;
struct RenderInfo ri; struct RenderInfo ri;
struct Pattern pattern; struct pPattern pattern;
unsigned long rows; unsigned long rows;
uae_u8 *uae_mem; uae_u8 *uae_mem;
int xshift; int xshift;
...@@ -2977,7 +2977,7 @@ void init_hz_p96 (void) ...@@ -2977,7 +2977,7 @@ void init_hz_p96 (void)
} }
/* NOTE: Watch for those planeptrs of 0x00000000 and 0xFFFFFFFF for all zero / all one bitmaps !!!! */ /* NOTE: Watch for those planeptrs of 0x00000000 and 0xFFFFFFFF for all zero / all one bitmaps !!!! */
static void PlanarToChunky (struct RenderInfo *ri, struct BitMap *bm, static void PlanarToChunky (struct RenderInfo *ri, struct pBitMap *bm,
unsigned long srcx, unsigned long srcy, unsigned long srcx, unsigned long srcy,
unsigned long dstx, unsigned long dsty, unsigned long dstx, unsigned long dsty,
unsigned long width, unsigned long height, unsigned long width, unsigned long height,
...@@ -3046,7 +3046,7 @@ static void PlanarToChunky (struct RenderInfo *ri, struct BitMap *bm, ...@@ -3046,7 +3046,7 @@ static void PlanarToChunky (struct RenderInfo *ri, struct BitMap *bm,
/* /*
* BlitPlanar2Chunky: * BlitPlanar2Chunky:
* a0: struct BoardInfo *bi * a0: struct BoardInfo *bi
* a1: struct BitMap *bm - source containing planar information and assorted details * a1: struct pBitMap *bm - source containing planar information and assorted details
* a2: struct RenderInfo *ri - dest area and its details * a2: struct RenderInfo *ri - dest area and its details
* d0.w: SrcX * d0.w: SrcX
* d1.w: SrcY * d1.w: SrcY
...@@ -3074,7 +3074,7 @@ static uae_u32 REGPARAM2 picasso_BlitPlanar2Chunky (TrapContext *ctx) ...@@ -3074,7 +3074,7 @@ static uae_u32 REGPARAM2 picasso_BlitPlanar2Chunky (TrapContext *ctx)
uae_u8 minterm = m68k_dreg (regs, 6) & 0xFF; uae_u8 minterm = m68k_dreg (regs, 6) & 0xFF;
uae_u8 mask = m68k_dreg (regs, 7) & 0xFF; uae_u8 mask = m68k_dreg (regs, 7) & 0xFF;
struct RenderInfo local_ri; struct RenderInfo local_ri;
struct BitMap local_bm; struct pBitMap local_bm;
uae_u32 result = 0; uae_u32 result = 0;
if (NOBLITTER) if (NOBLITTER)
...@@ -3093,7 +3093,7 @@ static uae_u32 REGPARAM2 picasso_BlitPlanar2Chunky (TrapContext *ctx) ...@@ -3093,7 +3093,7 @@ static uae_u32 REGPARAM2 picasso_BlitPlanar2Chunky (TrapContext *ctx)
} }
/* NOTE: Watch for those planeptrs of 0x00000000 and 0xFFFFFFFF for all zero / all one bitmaps !!!! */ /* NOTE: Watch for those planeptrs of 0x00000000 and 0xFFFFFFFF for all zero / all one bitmaps !!!! */
static void PlanarToDirect (struct RenderInfo *ri, struct BitMap *bm, static void PlanarToDirect (struct RenderInfo *ri, struct pBitMap *bm,
unsigned long srcx, unsigned long srcy, unsigned long srcx, unsigned long srcy,
unsigned long dstx, unsigned long dsty, unsigned long dstx, unsigned long dsty,
unsigned long width, unsigned long height, uae_u8 mask, struct ColorIndexMapping *cim) unsigned long width, unsigned long height, uae_u8 mask, struct ColorIndexMapping *cim)
...@@ -3179,7 +3179,7 @@ static void PlanarToDirect (struct RenderInfo *ri, struct BitMap *bm, ...@@ -3179,7 +3179,7 @@ static void PlanarToDirect (struct RenderInfo *ri, struct BitMap *bm,
* BlitPlanar2Direct(bi, bm, ri, cim, SrcX, SrcY, DstX, DstY, SizeX, SizeY, MinTerm, Mask); * BlitPlanar2Direct(bi, bm, ri, cim, SrcX, SrcY, DstX, DstY, SizeX, SizeY, MinTerm, Mask);
* Inputs: * Inputs:
* a0:struct BoardInfo *bi * a0:struct BoardInfo *bi
* a1:struct BitMap *bm * a1:struct pBitMap *bm
* a2:struct RenderInfo *ri * a2:struct RenderInfo *ri
* a3:struct ColorIndexMapping *cmi * a3:struct ColorIndexMapping *cmi
* d0.w:SrcX * d0.w:SrcX
...@@ -3213,7 +3213,7 @@ static uae_u32 REGPARAM2 picasso_BlitPlanar2Direct (TrapContext *ctx) ...@@ -3213,7 +3213,7 @@ static uae_u32 REGPARAM2 picasso_BlitPlanar2Direct (TrapContext *ctx)
uae_u8 minterm = m68k_dreg (regs, 6); uae_u8 minterm = m68k_dreg (regs, 6);
uae_u8 Mask = m68k_dreg (regs, 7); uae_u8 Mask = m68k_dreg (regs, 7);
struct RenderInfo local_ri; struct RenderInfo local_ri;
struct BitMap local_bm; struct pBitMap local_bm;
struct ColorIndexMapping local_cim; struct ColorIndexMapping local_cim;
uae_u32 result = 0; uae_u32 result = 0;
......
...@@ -294,6 +294,9 @@ ...@@ -294,6 +294,9 @@
/* Define to the address where bug reports for this package should be sent. */ /* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT #undef PACKAGE_BUGREPORT
/* cloned git commit version */
#undef PACKAGE_COMMIT
/* Define to the full name of this package. */ /* Define to the full name of this package. */
#undef PACKAGE_NAME #undef PACKAGE_NAME
......
/* sysconfig.h.in. Generated from configure.in by autoheader. */ /* src/sysconfig.h.in. Generated from configure.in by autoheader. */
/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ /* Define if building universal (internal helper macro) */
#undef HAVE_DOPRNT #undef AC_APPLE_UNIVERSAL_BUILD
/* CPU is 64bit */
#undef CPU_64_BIT
/* we want ecs_denise */
#undef ECS_DENISE
/* CPU supports 3DNOW */
#undef HAVE_3DNOW
/* Define to 1 if you have the `alarm' function. */
#undef HAVE_ALARM
/* Define to 1 if you have the 'bswap_16' function. */
#undef HAVE_BSWAP_16
/* Define to 1 if you have the 'bswap_32' function. */
#undef HAVE_BSWAP_32
/* Define to 1 if you have the <byteswap.h> header file. */
#undef HAVE_BYTESWAP_H
/* Define to 1 if you have the <caps/capsimage.h> header file. */
#undef HAVE_CAPS_CAPSIMAGE_H
/* Define to 1 if you have the <curses.h> header file. */
#undef HAVE_CURSES_H
/* Define to 1 if you have the <cybergraphx/cybergraphics.h> header file. */
#undef HAVE_CYBERGRAPHX_CYBERGRAPHICS_H
/* Define to 1 if you have the <devices/ahi.h> header file. */
#undef HAVE_DEVICES_AHI_H
/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
*/
#undef HAVE_DIRENT_H
/* "Define to 1 if you have 'dlopen' function */
#undef HAVE_DLOPEN
/* Define to 1 if you have the <dustat.h> header file. */
#undef HAVE_DUSTAT_H
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
/* Define to 1 if you have the CAPS framework. */
#undef HAVE_FRAMEWORK_CAPSIMAGE
/* Define to 1 if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
/* Define to 1 if you have the `gmtime_r' function. */
#undef HAVE_GMTIME_R
/* Define to 1 if you have the <inttypes.h> header file. */ /* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H #undef HAVE_INTTYPES_H
/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
declares uintmax_t. */
#undef HAVE_INTTYPES_H_WITH_UINTMAX
/* Define to 1 if you have the `isinf' function. */
#undef HAVE_ISINF
/* Define to 1 if you have the `isnan' function. */
#undef HAVE_ISNAN
/* Define to 1 if you have the <libraries/cybergraphics.h> header file. */
#undef HAVE_LIBRARIES_CYBERGRAPHICS_H
/* Define to 1 if you have the `localtime_r' function. */
#undef HAVE_LOCALTIME_R
/* Define to 1 if you have the <machine/joystick.h> header file. */
#undef HAVE_MACHINE_JOYSTICK_H
/* Define to 1 if you have the <machine/soundcard.h> header file. */
#undef HAVE_MACHINE_SOUNDCARD_H
/* Define to 1 if you have the <memory.h> header file. */ /* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H #undef HAVE_MEMORY_H
/* CPU supports MMX */
#undef HAVE_MMX
/* Define to 1 if you have the `nanosleep' function. */
#undef HAVE_NANOSLEEP
/* Define to 1 if you have the <ncurses.h> header file. */
#undef HAVE_NCURSES_H
/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
#undef HAVE_NDIR_H
/* Define if you have POSIX threads libraries and header files. */
#undef HAVE_PTHREAD
/* Define to 1 if you have the `readdir_r' function. */
#undef HAVE_READDIR_R
/* Define to 1 if you have the `select' function. */
#undef HAVE_SELECT
/* Define to 1 if you have the `setitimer' function. */
#undef HAVE_SETITIMER
/* Define to 1 if you have the `sigaction' function. */
#undef HAVE_SIGACTION
/* Define to 1 if you have the `sleep' function. */
#undef HAVE_SLEEP
/* CPU supports SSE */
#undef HAVE_SSE
/* CPU supports SSE2 */
#undef HAVE_SSE2
/* CPU supports SSE3 */
#undef HAVE_SSE3
/* CPU supports SSE4_1 */
#undef HAVE_SSE4_1
/* CPU supports SSE4_2 */
#undef HAVE_SSE4_2
/* CPU supports SSSE3 */
#undef HAVE_SSSE3
/* Define to 1 if stdbool.h conforms to C99. */
#undef HAVE_STDBOOL_H
/* Define to 1 if you have the <stdint.h> header file. */ /* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H #undef HAVE_STDINT_H
/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
uintmax_t. */
#undef HAVE_STDINT_H_WITH_UINTMAX
/* Define to 1 if you have the <stdlib.h> header file. */ /* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H #undef HAVE_STDLIB_H
...@@ -24,6 +156,9 @@ ...@@ -24,6 +156,9 @@
/* Define to 1 if you have the `strdup' function. */ /* Define to 1 if you have the `strdup' function. */
#undef HAVE_STRDUP #undef HAVE_STRDUP
/* Define to 1 if you have the `strerror' function. */
#undef HAVE_STRERROR
/* Define to 1 if you have the `stricmp' function. */ /* Define to 1 if you have the `stricmp' function. */
#undef HAVE_STRICMP #undef HAVE_STRICMP
...@@ -33,18 +168,129 @@ ...@@ -33,18 +168,129 @@
/* Define to 1 if you have the <string.h> header file. */ /* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H #undef HAVE_STRING_H
/* Define to 1 if you have the `strstr' function. */
#undef HAVE_STRSTR
/* Define to 1 if `st_blocks' is a member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_BLOCKS
/* Define to 1 if your `struct stat' has `st_blocks'. Deprecated, use
`HAVE_STRUCT_STAT_ST_BLOCKS' instead. */
#undef HAVE_ST_BLOCKS
/* Define to 1 if you have the <sun/audioio.h> header file. */
#undef HAVE_SUN_AUDIOIO_H
/* Define to 1 if you have the `sync' function. */
#undef HAVE_SYNC
/* Define to 1 if you have the <sys/audioio.h> header file. */
#undef HAVE_SYS_AUDIOIO_H
/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
*/
#undef HAVE_SYS_DIR_H
/* Define to 1 if you have the <sys/filio.h> header file. */
#undef HAVE_SYS_FILIO_H
/* Define to 1 if you have the <sys/filsys.h> header file. */
#undef HAVE_SYS_FILSYS_H
/* Define to 1 if you have the <sys/fs/s5param.h> header file. */
#undef HAVE_SYS_FS_S5PARAM_H
/* Define to 1 if you have the <sys/fs_types.h> header file. */
#undef HAVE_SYS_FS_TYPES_H
/* Define to 1 if you have the <sys/ioctl.h> header file. */
#undef HAVE_SYS_IOCTL_H
/* Define to 1 if you have the <sys/ipc.h> header file. */
#undef HAVE_SYS_IPC_H
/* Define to 1 if you have the <sys/mman.h> header file. */
#undef HAVE_SYS_MMAN_H
/* Define to 1 if you have the <sys/mount.h> header file. */
#undef HAVE_SYS_MOUNT_H
/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
*/
#undef HAVE_SYS_NDIR_H
/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
/* Define to 1 if you have the <sys/shm.h> header file. */
#undef HAVE_SYS_SHM_H
/* Define to 1 if you have the <sys/soundcard.h> header file. */
#undef HAVE_SYS_SOUNDCARD_H
/* Define to 1 if you have the <sys/statfs.h> header file. */
#undef HAVE_SYS_STATFS_H
/* Define to 1 if you have the <sys/statvfs.h> header file. */
#undef HAVE_SYS_STATVFS_H
/* Define to 1 if you have the <sys/stat.h> header file. */ /* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H #undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/termios.h> header file. */
#undef HAVE_SYS_TERMIOS_H
/* Define to 1 if you have the <sys/time.h> header file. */
#undef HAVE_SYS_TIME_H
/* Define to 1 if you have the <sys/types.h> header file. */ /* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H #undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <sys/vfs.h> header file. */
#undef HAVE_SYS_VFS_H
/* Define to 1 if you have the `timegm' function. */
#undef HAVE_TIMEGM
/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
#undef HAVE_UINTMAX_T
/* Define to 1 if you have the <unistd.h> header file. */ /* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H #undef HAVE_UNISTD_H
/* Define if you have the 'unsigned long long' type. */
#undef HAVE_UNSIGNED_LONG_LONG
/* Define to 1 if you have the `usleep' function. */
#undef HAVE_USLEEP
/* Define to 1 if you have the <utime.h> header file. */
#undef HAVE_UTIME_H
/* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */
#undef HAVE_UTIME_NULL
/* Define to 1 if you have the <values.h> header file. */
#undef HAVE_VALUES_H
/* Define to 1 if you have the `vfprintf' function. */
#undef HAVE_VFPRINTF
/* Define to 1 if you have the `vprintf' function. */ /* Define to 1 if you have the `vprintf' function. */
#undef HAVE_VPRINTF #undef HAVE_VPRINTF
/* Define to 1 if you have the `vsprintf' function. */
#undef HAVE_VSPRINTF
/* Define to 1 if the system has the type `_Bool'. */
#undef HAVE__BOOL
/* Define to 1 if your CPU profitably supports multiplication. */
#undef MULTIPLICATION_PROFITABLE
/* Name of package */
#undef PACKAGE
/* Define to the address where bug reports for this package should be sent. */ /* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT #undef PACKAGE_BUGREPORT
...@@ -57,9 +303,22 @@ ...@@ -57,9 +303,22 @@
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME #undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */ /* Define to the version of this package. */
#undef PACKAGE_VERSION #undef PACKAGE_VERSION
/* cloned git commit version */
#undef PACKAGE_COMMIT
/* Define to the necessary symbol if this constant uses a non-standard name on
your system. */
#undef PTHREAD_CREATE_JOINABLE
/* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
/* The size of `char', as computed by sizeof. */ /* The size of `char', as computed by sizeof. */
#undef SIZEOF_CHAR #undef SIZEOF_CHAR
...@@ -81,15 +340,101 @@ ...@@ -81,15 +340,101 @@
/* The size of `__int64', as computed by sizeof. */ /* The size of `__int64', as computed by sizeof. */
#undef SIZEOF___INT64 #undef SIZEOF___INT64
/* Define if the block counts reported by statfs may be truncated to 2GB and
the correct values may be stored in the f_spare array. (SunOS 4.1.2, 4.1.3,
and 4.1.3_U1 are reported to have this problem. SunOS 4.1.1 seems not to be
affected.) */
#undef STATFS_TRUNCATES_BLOCK_COUNTS
/* Define if there is no specific function for reading filesystems usage
information and you have the <sys/filsys.h> header file. (SVR2) */
#undef STAT_READ_FILSYS
/* Define if statfs takes 2 args and struct statfs has a field named f_bsize.
(4.3BSD, SunOS 4, HP-UX, AIX PS/2) */
#undef STAT_STATFS2_BSIZE
/* Define if statfs takes 2 args and struct statfs has a field named f_fsize.
(4.4BSD, NetBSD) */
#undef STAT_STATFS2_FSIZE
/* Define if statfs takes 2 args and the second argument has type struct
fs_data. (Ultrix) */
#undef STAT_STATFS2_FS_DATA
/* Define if statfs takes 3 args. (DEC Alpha running OSF/1) */
#undef STAT_STATFS3_OSF1
/* Define if statfs takes 4 args. (SVR3, Dynix, Irix, Dolphin) */
#undef STAT_STATFS4
/* Define if there is a function named statvfs. (SVR4) */
#undef STAT_STATVFS
/* Define to 1 if you have the ANSI C header files. */ /* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS #undef STDC_HEADERS
/* Define to 1 if on AIX 3. /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
System headers sometimes define this. #undef TIME_WITH_SYS_TIME
We just want to avoid a redefinition error message. */
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME
/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE #ifndef _ALL_SOURCE
# undef _ALL_SOURCE # undef _ALL_SOURCE
#endif #endif
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
/* Enable threading extensions on Solaris. */
#ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS
#endif
/* Enable extensions on HP NonStop. */
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
/* Enable general extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
#endif
/* Version number of package */
#undef VERSION
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD
# if defined __BIG_ENDIAN__
# define WORDS_BIGENDIAN 1
# endif
#else
# ifndef WORDS_BIGENDIAN
# undef WORDS_BIGENDIAN
# endif
#endif
/* Define to 1 if the X Window System is missing or not being used. */
#undef X_DISPLAY_MISSING
/* Number of bits in a file offset, on hosts where this is settable. */
#undef _FILE_OFFSET_BITS
/* Define for large files, on AIX-style hosts. */
#undef _LARGE_FILES
/* Define to 1 if on MINIX. */
#undef _MINIX
/* Define to 2 if the system does not provide POSIX.1 features except with
this defined. */
#undef _POSIX_1_SOURCE
/* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE
/* Define to empty if `const' does not conform to ANSI C. */ /* Define to empty if `const' does not conform to ANSI C. */
#undef const #undef const
...@@ -99,3 +444,23 @@ ...@@ -99,3 +444,23 @@
#ifndef __cplusplus #ifndef __cplusplus
#undef inline #undef inline
#endif #endif
/* Define to `int' if <sys/types.h> does not define. */
#undef mode_t
/* Define to `long int' if <sys/types.h> does not define. */
#undef off_t
/* Define to `unsigned int' if <sys/types.h> does not define. */
#undef size_t
/* Substitute for socklen_t */
#undef socklen_t
/* Define to unsigned long or unsigned long long if <stdint.h> and
<inttypes.h> don't define. */
#undef uintmax_t
/* Define to empty if the keyword `volatile' does not work. Warning: valid
code using `volatile' can become incorrect without. Disable with care. */
#undef volatile
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment