diff options
Diffstat (limited to 'x11-toolkits/iv/files')
-rw-r--r-- | x11-toolkits/iv/files/patch-aa | 266 | ||||
-rw-r--r-- | x11-toolkits/iv/files/patch-ab | 26 | ||||
-rw-r--r-- | x11-toolkits/iv/files/patch-ac | 15 | ||||
-rw-r--r-- | x11-toolkits/iv/files/patch-ad | 271 |
4 files changed, 0 insertions, 578 deletions
diff --git a/x11-toolkits/iv/files/patch-aa b/x11-toolkits/iv/files/patch-aa deleted file mode 100644 index 3f053c293609..000000000000 --- a/x11-toolkits/iv/files/patch-aa +++ /dev/null @@ -1,266 +0,0 @@ -*** src/bin/iclass/dialogs.c Wed Sep 23 09:45:09 1992 ---- /usr/oports/x11/iv/src/bin/iclass/dialogs.c Tue Apr 26 17:01:39 1994 -*************** -*** 45,51 **** - #if !defined(AIXV3) && !defined(hpux) && !(defined(sun) && OSMajorVersion >= 5) - /* sigh, not all systems have this prototype */ - extern "C" { -! char* getcwd(char*, int); - } - #endif - ---- 45,51 ---- - #if !defined(AIXV3) && !defined(hpux) && !(defined(sun) && OSMajorVersion >= 5) - /* sigh, not all systems have this prototype */ - extern "C" { -! char* getcwd(char*, unsigned int); - } - #endif - -*** src/bin/scripts/Imakefile Thu Sep 12 15:01:39 1991 ---- /usr/oports/x11/iv/src/bin/scripts/Imakefile Tue Apr 26 17:01:52 1994 -*************** -*** 11,16 **** ---- 11,17 ---- - - AllTarget($(PROGRAMS)) - -+ CPP = /usr/bin/cpp - CppScriptTarget(cpu,cpu.cpp,-DCPU='"'"$(ARCH)"'"',always) - CppScriptTarget(ibmkmf,ibmkmf.cpp,-DCONFIGDIRSPEC='$(CONFIGDIRSPEC)',always) - CppScriptTarget(ivmkmf,ivmkmf.cpp,-DCONFIGDIRSPEC='$(CONFIGDIRSPEC)',always) -*** src/bin/scripts/remind.cpp Wed Jun 3 21:37:00 1992 ---- /usr/oports/x11/iv/src/bin/scripts/remind.cpp Tue Apr 26 17:01:53 1994 -*************** -*** 34,40 **** - ' > $tmp - - cat $MacrosFile $RemindersFile \ -! | /lib/cpp \ - | egrep -f $tmp \ - | awk ' - /[0-9][0-9]?:[0-9][0-9]?/ { ---- 34,40 ---- - ' > $tmp - - cat $MacrosFile $RemindersFile \ -! | /usr/bin/cpp \ - | egrep -f $tmp \ - | awk ' - /[0-9][0-9]?:[0-9][0-9]?/ { -*** src/config/InterViews/TIFF.def Fri Dec 11 15:33:54 1992 ---- /usr/oports/x11/iv/src/config/InterViews/TIFF.def Tue Apr 26 17:01:54 1994 -*************** -*** 90,95 **** ---- 90,100 ---- - * - */ - #ifndef TIFFStdCDefines -+ #if defined(FreeBSDArchitecture) -+ #define TIFFStdCDefines \ -+ -DCOLORIMETRY_SUPPORT -DYCBCR_SUPPORT -DMMAP_SUPPORT \ -+ -DHAVE_IEEEFP=1 -DUSE_VARARGS=1 -DUSE_PROTOTYPES=1 -DUSE_CONST=1 -+ #endif - #if defined(SGIArchitecture) - #define TIFFStdCDefines \ - -DCOLORIMETRY_SUPPORT -DJPEG_SUPPORT -DYCBCR_SUPPORT -DCMYK_SUPPORT \ -*** src/config/InterViews/arch.def Fri Dec 11 15:34:52 1992 ---- /usr/oports/x11/iv/src/config/InterViews/arch.def Tue Apr 26 17:01:55 1994 -*************** -*** 385,390 **** ---- 385,400 ---- - #define MacroFile InterViews/iv-convex.cf - #endif /* __convex__ */ - -+ #ifdef __FreeBSD__ -+ #undef freebsd -+ #undef FREEBSD -+ #define FreeBSDArchitecture -+ #define ArchitectureName FREEBSD -+ #define architectureName freebsd -+ #define MacroIncludeFile <InterViews/iv-freebsd.cf> -+ #define MacroFile InterViews/iv-freebsd.cf -+ #endif -+ - #ifndef ArchitectureName - XCOMM WARNING: Imakefile not configured; guessing at definitions!!! - XCOMM This might mean that BOOTSTRAPCFLAGS was not set when building imake. -*** src/config/InterViews/local.def Tue Nov 24 12:08:51 1992 ---- /usr/oports/x11/iv/src/config/InterViews/local.def Thu Jun 16 18:34:11 1994 -*************** -*** 8,14 **** - /* - * If you are using gcc/g++, then uncomment the include below. - */ -! /* #include <InterViews/gcc.def> */ - - /* - * Default customization of kits. ---- 8,19 ---- - /* - * If you are using gcc/g++, then uncomment the include below. - */ -! #include <InterViews/gcc.def> -! -! #if defined(FreeBSDArchitecture) -! #undef HasSunOSSharedLibs -! #define HasSunOSSharedLibs YES -! #endif - - /* - * Default customization of kits. -*************** -*** 33,38 **** ---- 38,48 ---- - #define BuildRPCClasses YES - #endif - -+ #if defined (FreeBSDArchitecture) -+ #undef BuildRPCClasses -+ #define BuildRPCClasses NO -+ #endif -+ - /* - * Delete this definition if your /tmp space is less than five megabytes. - */ -*************** -*** 49,55 **** - * installed data files. - */ - #undef InstalledRoot -! #define InstalledRoot /interviews - - /* - * If the X11 config files are not in /usr/lib/X11/config, the X11 ---- 59,65 ---- - * installed data files. - */ - #undef InstalledRoot -! #define InstalledRoot /usr/local/interviews - - /* - * If the X11 config files are not in /usr/lib/X11/config, the X11 -*************** -*** 60,70 **** - * If you have to set XConfigDir, don't forget to override XCONFIGDIR - * on the command line when saying "make World" for the first time. - */ -! /* - #undef XConfigDir -! #define XConfigDir /usr/X11R5/lib/X11/config - #undef XIncDir -! #define XIncDir /usr/X11R5/include - #undef XLibDir -! #define XLibDir /usr/X11R5/lib -! */ ---- 70,80 ---- - * If you have to set XConfigDir, don't forget to override XCONFIGDIR - * on the command line when saying "make World" for the first time. - */ -! - #undef XConfigDir -! #define XConfigDir /usr/X11R6/lib/X11/config - #undef XIncDir -! #define XIncDir /usr/X11R6/include - #undef XLibDir -! #define XLibDir /usr/X11R6/lib -! -*** src/config/InterViews/rules.def Thu Sep 24 15:06:33 1992 ---- /usr/oports/x11/iv/src/config/InterViews/rules.def Thu Jun 16 18:34:12 1994 -*************** -*** 399,404 **** ---- 399,421 ---- - /* - * Make a shared library. - */ -+ #if defined(FreeBSDArchitecture) -+ #define NormalSunOSSharedLibraryTarget(libname,rev,depobjs,ldobjs) @@\ -+ AOUT = Concat(lib,libname.so.rev) @@\ -+ SHARED_CCFLAGS = SharedCCFlags @@\ -+ @@\ -+ AllTarget(Concat(lib,libname.so.rev)) @@\ -+ @@\ -+ Concat(lib,libname.so.rev): depobjs @@\ -+ @echo "building $@" @@\ -+ $(RM) $@~ @@\ -+ $(LD) -o $@~ -Bshareable ldobjs @@\ -+ $(RM) $@ @@\ -+ $(MV) $@~ $@ @@\ -+ @@\ -+ clean:: @@\ -+ $(RM) Concat(lib,libname.so.rev) -+ #else - #ifndef NormalSunOSSharedLibraryTarget - #if OSMajorVersion < 5 - #define NormalSunOSSharedLibraryTarget(libname,rev,depobjs,ldobjs) @@\ -*************** -*** 434,439 **** ---- 451,457 ---- - @@\ - clean:: @@\ - $(RM) Concat(lib,libname.so.rev) -+ #endif - #endif - #endif - -*** src/lib/IV-X11/xwindow.c Mon Nov 23 12:26:43 1992 ---- /usr/oports/x11/iv/src/lib/IV-X11/xwindow.c Tue Apr 26 17:03:44 1994 -*************** -*** 64,70 **** - - /* no standard place for this */ - extern "C" { -! extern int ioctl(int, int, ...); - } - - implementPtrList(WindowVisualList,WindowVisual) ---- 64,70 ---- - - /* no standard place for this */ - extern "C" { -! extern int ioctl(int, long unsigned int, ...); - } - - implementPtrList(WindowVisualList,WindowVisual) -*** src/lib/OS/string.c Mon Jul 13 10:54:03 1992 ---- /usr/oports/x11/iv/src/lib/OS/string.c Thu Jun 16 18:37:30 1994 -*************** -*** 31,41 **** ---- 31,43 ---- - */ - - extern "C" { -+ #ifndef __FreeBSD__ - #ifndef tolower - extern int tolower(int); - #endif - #ifndef toupper - extern int toupper(int); -+ #endif - #endif - extern long int strtol(const char*, char**, int); - extern double strtod(const char*, char**); -*** src/lib/TIFF/mkg3states.c Fri Mar 6 11:11:03 1992 ---- /usr/oports/x11/iv/src/lib/TIFF/mkg3states.c Tue Apr 26 17:03:59 1994 -*************** -*** 68,73 **** ---- 68,74 ---- - * END (from the original source) - */ - #include <stdio.h> -+ #define va_dcl /**/ - #include "prototypes.h" - - #ifndef TRUE -*** src/lib/TIFF/prototypes.h Tue Feb 18 18:20:12 1992 ---- /usr/oports/x11/iv/src/lib/TIFF/prototypes.h Tue Apr 26 17:03:59 1994 -*************** -*** 25,30 **** ---- 25,31 ---- - */ - - #if USE_PROTOTYPES -+ va_dcl - #define DECLARE1(f,t1,a1) f(t1 a1) - #define DECLARE2(f,t1,a1,t2,a2) f(t1 a1, t2 a2) - #define DECLARE3(f,t1,a1,t2,a2,t3,a3) f(t1 a1, t2 a2, t3 a3) diff --git a/x11-toolkits/iv/files/patch-ab b/x11-toolkits/iv/files/patch-ab deleted file mode 100644 index 64d9ce8ea2a8..000000000000 --- a/x11-toolkits/iv/files/patch-ab +++ /dev/null @@ -1,26 +0,0 @@ -*** makefile.old Sat Sep 24 06:49:19 1994 ---- makefile Sat Sep 24 05:47:49 1994 -*************** -*** 0 **** ---- 1,21 ---- -+ CPU=FREEBSD -+ -+ all: src/Makefile -+ @$(MAKE) $(.MAKEFLAGS) -f Makefile 'CPU=$(CPU)' -+ -+ # simple but brutal. Will not install to multiple destinations simultaneously. -+ install: Makefile -+ @rm -rf installed ${DESTDIR}/usr/local/interviews -+ @mkdir -p ${DESTDIR}/usr/local/interviews -+ @ln -s ${DESTDIR}/usr/local/interviews installed -+ @$(MAKE) $(.MAKEFLAGS) -f Makefile 'CPU=$(CPU)' $@ -+ -+ src/Makefile: Makefile -+ @$(MAKE) Makefiles -+ -+ Makefile: -+ imake -T "InterViews/template" -I./src/config \ -+ -I/usr/X386/lib/X11/config -DTOPDIR=. -DCURDIR=. -+ -+ .DEFAULT: src/Makefile -+ @$(MAKE) $(.MAKEFLAGS) -f Makefile 'CPU=$(CPU)' $@ diff --git a/x11-toolkits/iv/files/patch-ac b/x11-toolkits/iv/files/patch-ac deleted file mode 100644 index e3e6ef75aca2..000000000000 --- a/x11-toolkits/iv/files/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ -*** src/config/InterViews/iv-freebsd.cf Mon Oct 31 17:31:42 1994 ---- src/config/InterViews/iv-freebsd.cf Mon Oct 31 17:36:04 1994 -*************** -*** 0 **** ---- 1,10 ---- -+ #include <InterViews/xparams.cf> -+ #undef CppCmd -+ #define CppCmd cpp -+ #undef CCDriver -+ #define CCDriver c++ -+ #undef DependCCFlags -+ #define DependCCFlags $(CCDEFINES) $(CCINCLUDES) -I/usr/include/g++ -+ #undef ExtraCCLdLibs -+ #define ExtraCCLdLibs -lg++ -+ #define SharedCCFlags -fpic diff --git a/x11-toolkits/iv/files/patch-ad b/x11-toolkits/iv/files/patch-ad deleted file mode 100644 index 0ce7c387d1d2..000000000000 --- a/x11-toolkits/iv/files/patch-ad +++ /dev/null @@ -1,271 +0,0 @@ -diff -rc work-orig/iv/src/include/IV-X11/xwindow.h work/iv/src/include/IV-X11/xwindow.h -*** work-orig/iv/src/include/IV-X11/xwindow.h Fri Sep 25 07:46:22 1992 ---- ./src/include/IV-X11/xwindow.h Sun May 28 12:49:16 1995 -*************** -*** 46,53 **** - class Style; - class WindowCursorStack; - class WindowTable; - class XDisplay; -! - struct WindowOverlayInfo { - VisualID id_; - long type_; ---- 46,58 ---- - class Style; - class WindowCursorStack; - class WindowTable; -+ /* -+ * modified by jj@ldjpc.apana.org.au -+ * -+ * this seems to break the compile... - class XDisplay; -! * -! */ - struct WindowOverlayInfo { - VisualID id_; - long type_; -diff -rc work-orig/iv/src/lib/TIFF/prototypes.h work/iv/src/lib/TIFF/prototypes.h -*** work-orig/iv/src/lib/TIFF/prototypes.h Sun May 28 12:39:56 1995 ---- ./src/lib/TIFF/prototypes.h Sun May 28 14:21:04 1995 -*************** -*** 25,31 **** - */ - - #if USE_PROTOTYPES -- va_dcl - #define DECLARE1(f,t1,a1) f(t1 a1) - #define DECLARE2(f,t1,a1,t2,a2) f(t1 a1, t2 a2) - #define DECLARE3(f,t1,a1,t2,a2,t3,a3) f(t1 a1, t2 a2, t3 a3) ---- 25,30 ---- -diff -rc work-orig/iv/src/lib/TIFF/tif_aux.c work/iv/src/lib/TIFF/tif_aux.c -*** work-orig/iv/src/lib/TIFF/tif_aux.c Sat Mar 28 08:23:06 1992 ---- ./src/lib/TIFF/tif_aux.c Sun May 28 14:15:50 1995 -*************** -*** 42,47 **** ---- 42,49 ---- - * explcit values so that defaults exist only one - * place in the library -- in TIFFDefaultDirectory. - */ -+ ; -+ /* for some reason it needs a ; before this line */ - TIFFVGetFieldDefaulted(tif, tag, ap) - TIFF *tif; - int tag; -diff -rc work-orig/iv/src/lib/TIFF/tif_dir.c work/iv/src/lib/TIFF/tif_dir.c -*** work-orig/iv/src/lib/TIFF/tif_dir.c Sat Mar 7 06:29:51 1992 ---- ./src/lib/TIFF/tif_dir.c Sun May 28 13:00:03 1995 -*************** -*** 950,956 **** - } - if (tif->tif_flags & TIFF_SWAB) - TIFFSwabShort(&dircount); -! lseek(tif->tif_fd, dircount*sizeof (TIFFDirEntry), L_INCR); - if (!ReadOK(tif->tif_fd, &nextdir, sizeof (nextdir))) { - TIFFError(module, "%s: Error fetching directory link", - tif->tif_name); ---- 950,957 ---- - } - if (tif->tif_flags & TIFF_SWAB) - TIFFSwabShort(&dircount); -! /*added (off_t) .. jj@ldjpc.apana.org.au*/ -! lseek(tif->tif_fd, (off_t)(dircount*sizeof (TIFFDirEntry)), L_INCR); - if (!ReadOK(tif->tif_fd, &nextdir, sizeof (nextdir))) { - TIFFError(module, "%s: Error fetching directory link", - tif->tif_name); -diff -rc work-orig/iv/src/lib/TIFF/tif_dirwrite.c work/iv/src/lib/TIFF/tif_dirwrite.c -*** work-orig/iv/src/lib/TIFF/tif_dirwrite.c Wed Mar 18 05:39:29 1992 ---- ./src/lib/TIFF/tif_dirwrite.c Sun May 28 12:57:11 1995 -*************** -*** 177,183 **** - dataoff = tif->tif_diroff + sizeof (short) + dirsize + sizeof (long); - if (dataoff & 1) - dataoff++; -! (void) lseek(tif->tif_fd, dataoff, L_SET); - tif->tif_curdir++; - dir = (TIFFDirEntry *)data; - /* ---- 177,184 ---- - dataoff = tif->tif_diroff + sizeof (short) + dirsize + sizeof (long); - if (dataoff & 1) - dataoff++; -! /* added (off_t) below.....jj@ldjpc.apana.org.au*/ -! (void) lseek(tif->tif_fd, (off_t)(dataoff), L_SET); - tif->tif_curdir++; - dir = (TIFFDirEntry *)data; - /* -*************** -*** 314,320 **** - /* - * Write directory. - */ -! (void) lseek(tif->tif_fd, tif->tif_diroff, L_SET); - dircount = nfields; - if (!WriteOK(tif->tif_fd, &dircount, sizeof (short))) { - TIFFError(tif->tif_name, "Error writing directory count"); ---- 315,322 ---- - /* - * Write directory. - */ -! /*added (off_t) below.....jj@ldjpc.apana.org.au*/ -! (void) lseek(tif->tif_fd, (off_t)(tif->tif_diroff), L_SET); - dircount = nfields; - if (!WriteOK(tif->tif_fd, &dircount, sizeof (short))) { - TIFFError(tif->tif_name, "Error writing directory count"); -*************** -*** 762,774 **** - u_short dircount; - long nextdir; - -! tif->tif_diroff = (lseek(tif->tif_fd, 0L, L_XTND)+1) &~ 1L; - if (tif->tif_header.tiff_diroff == 0) { - /* - * First directory, overwrite header. - */ - tif->tif_header.tiff_diroff = tif->tif_diroff; -! (void) lseek(tif->tif_fd, 0L, L_SET); - if (!WriteOK(tif->tif_fd, &tif->tif_header, - sizeof (tif->tif_header))) { - TIFFError(tif->tif_name, "Error writing TIFF header"); ---- 764,778 ---- - u_short dircount; - long nextdir; - -! /* changed 0L to (off_t)0 below...jj@ldjpc.apana.org.au*/ -! tif->tif_diroff = (lseek(tif->tif_fd, (off_t)0, L_XTND)+1) &~ 1L; - if (tif->tif_header.tiff_diroff == 0) { - /* - * First directory, overwrite header. - */ - tif->tif_header.tiff_diroff = tif->tif_diroff; -! /* changed 0L to (off_t)0 .. jj@ldjpc.apana.org.au*/ -! (void) lseek(tif->tif_fd, (off_t)0, L_SET); - if (!WriteOK(tif->tif_fd, &tif->tif_header, - sizeof (tif->tif_header))) { - TIFFError(tif->tif_name, "Error writing TIFF header"); -*************** -*** 788,794 **** - } - if (tif->tif_flags & TIFF_SWAB) - TIFFSwabShort(&dircount); -! lseek(tif->tif_fd, dircount * sizeof (TIFFDirEntry), L_INCR); - if (!ReadOK(tif->tif_fd, &nextdir, sizeof (nextdir))) { - TIFFError(module, "Error fetching directory link"); - return (0); ---- 792,799 ---- - } - if (tif->tif_flags & TIFF_SWAB) - TIFFSwabShort(&dircount); -! /*added (off_t) below....jj@ldjpc.apana.org.au*/ -! lseek(tif->tif_fd, (off_t)(dircount * sizeof (TIFFDirEntry)), L_INCR); - if (!ReadOK(tif->tif_fd, &nextdir, sizeof (nextdir))) { - TIFFError(module, "Error fetching directory link"); - return (0); -*************** -*** 796,802 **** - if (tif->tif_flags & TIFF_SWAB) - TIFFSwabLong((u_long *)&nextdir); - } while (nextdir != 0); -! (void) lseek(tif->tif_fd, -sizeof (nextdir), L_INCR); - if (!WriteOK(tif->tif_fd, &tif->tif_diroff, sizeof (tif->tif_diroff))) { - TIFFError(module, "Error writing directory link"); - return (0); ---- 801,808 ---- - if (tif->tif_flags & TIFF_SWAB) - TIFFSwabLong((u_long *)&nextdir); - } while (nextdir != 0); -! /*added (off_t) below ... jj@ldjpc.apana.org.au*/ -! (void) lseek(tif->tif_fd, (off_t)(-sizeof (nextdir)), L_INCR); - if (!WriteOK(tif->tif_fd, &tif->tif_diroff, sizeof (tif->tif_diroff))) { - TIFFError(module, "Error writing directory link"); - return (0); -diff -rc work-orig/iv/src/lib/TIFF/tif_write.c work/iv/src/lib/TIFF/tif_write.c -*** work-orig/iv/src/lib/TIFF/tif_write.c Tue Feb 11 13:36:47 1992 ---- ./src/lib/TIFF/tif_write.c Sun May 28 12:57:57 1995 -*************** -*** 550,556 **** - } - } else - td->td_stripoffset[strip] = -! lseek(tif->tif_fd, 0L, L_XTND); - tif->tif_curoff = td->td_stripoffset[strip]; - } - if (!WriteOK(tif->tif_fd, data, cc)) { ---- 550,557 ---- - } - } else - td->td_stripoffset[strip] = -! /*changed 0L to (off_t)0 .. jj@ldjpc.apana.org.au*/ -! lseek(tif->tif_fd, (off_t)0, L_XTND); - tif->tif_curoff = td->td_stripoffset[strip]; - } - if (!WriteOK(tif->tif_fd, data, cc)) { -diff -rc work-orig/iv/src/lib/TIFF/tiffcompat.h work/iv/src/lib/TIFF/tiffcompat.h -*** work-orig/iv/src/lib/TIFF/tiffcompat.h Tue Mar 31 12:01:04 1992 ---- ./src/lib/TIFF/tiffcompat.h Sun May 28 14:13:59 1995 -*************** -*** 154,160 **** - #define lseek mpw_lseek - extern long mpw_lseek(int, long, int); - #else -! extern long lseek(); - #endif - - /* ---- 154,161 ---- - #define lseek mpw_lseek - extern long mpw_lseek(int, long, int); - #else -! /*changed to the correct one...jj@ldjpc.apana.org.au*/ -! extern off_t lseek(); - #endif - - /* -*************** -*** 163,170 **** - #ifndef ReadOK - #define ReadOK(fd, buf, size) (read(fd, (char *)buf, size) == size) - #endif - #ifndef SeekOK -! #define SeekOK(fd, off) (lseek(fd, (long)off, L_SET) == (long)off) - #endif - #ifndef WriteOK - #define WriteOK(fd, buf, size) (write(fd, (char *)buf, size) == size) ---- 164,172 ---- - #ifndef ReadOK - #define ReadOK(fd, buf, size) (read(fd, (char *)buf, size) == size) - #endif -+ /*changed (long) to (off_t) to compile....jj@ldjpc.apana.org.au*/ - #ifndef SeekOK -! #define SeekOK(fd, off) (lseek(fd, (off_t)off, L_SET) == (off_t)off) - #endif - #ifndef WriteOK - #define WriteOK(fd, buf, size) (write(fd, (char *)buf, size) == size) -*************** -*** 202,211 **** - */ - #if defined(__STDC__) && !defined(USE_VARARGS) - #define USE_VARARGS 0 - #endif - - #if defined(USE_VARARGS) -! #if USE_VARARGS - #include <varargs.h> - #define VA_START(ap, parmN) va_start(ap) - #else ---- 204,218 ---- - */ - #if defined(__STDC__) && !defined(USE_VARARGS) - #define USE_VARARGS 0 -+ #else -+ #if defined(__FreeBSD__) -+ #undef USE_VARARGS -+ #define USE_VARARGS 0 -+ #endif - #endif - - #if defined(USE_VARARGS) -! #if USE_VARARGS && !defined(__FreeBSD__) - #include <varargs.h> - #define VA_START(ap, parmN) va_start(ap) - #else |