From d9f5091a8a4653cf6a023c90f467016100dc5dfa Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sun, 20 Sep 2009 07:02:25 +0000 Subject: * configure.ac.pamphlet: Don't define CPP LINUXplaform, MACOSXplaform, and MSYSplatoform macros. src/ * lib/XDither.c: Tidy. * lib/XShade.c: Likewise. * lib/XSpadFill.c: Likewise. * lib/bsdsignal.c: Likewise. * lib/edin.c: Likewise. * lib/fnct_key.c: Likewise. * lib/util.c: Likewise. * lib/wct.c: Likewise. --- src/lib/XDither.c | 4 ++-- src/lib/XShade.c | 4 ++-- src/lib/XSpadFill.c | 4 ++-- src/lib/bsdsignal.c | 8 ++------ src/lib/edin.c | 6 ++---- src/lib/fnct_key.c | 6 ++---- src/lib/util.c | 8 ++------ src/lib/wct.c | 10 ++-------- 8 files changed, 16 insertions(+), 34 deletions(-) (limited to 'src/lib') diff --git a/src/lib/XDither.c b/src/lib/XDither.c index a16473ae..e3c15df0 100644 --- a/src/lib/XDither.c +++ b/src/lib/XDither.c @@ -1,6 +1,8 @@ /* Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. All rights reserved. + Copyright (C) Gabriel Dos Reis. + All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -32,7 +34,6 @@ */ #include "openaxiom-c-macros.h" -#ifndef MSYSplatform #include #include @@ -226,4 +227,3 @@ XDitherArcs(Display *display,Drawable drawable, GC gc, XArc *arcs,int narcs) } XFillArcs(display, drawable, gc, arcs, narcs); } -#endif /* MSYSplatform */ diff --git a/src/lib/XShade.c b/src/lib/XShade.c index 8c7b6d2f..4cc052c5 100644 --- a/src/lib/XShade.c +++ b/src/lib/XShade.c @@ -1,6 +1,8 @@ /* Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. All rights reserved. + Copyright (C) Gabriel Dos Reis. + All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -32,7 +34,6 @@ */ #include "openaxiom-c-macros.h" -#ifndef MSYSplatform #include #include @@ -207,5 +208,4 @@ XShadeArcs(Display *display, Drawable drawable, XArc *arcs, int narcs) XFillArcs(display, drawable, TileGC, arcs, narcs); } -#endif /* MSYSplatform */ diff --git a/src/lib/XSpadFill.c b/src/lib/XSpadFill.c index f71a861c..1487d95b 100644 --- a/src/lib/XSpadFill.c +++ b/src/lib/XSpadFill.c @@ -1,6 +1,8 @@ /* Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. All rights reserved. + Copyright (C) Gabriel Dos Reis. + All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -48,7 +50,6 @@ #include "openaxiom-c-macros.h" -#ifndef MSYSplatform #include #include @@ -296,5 +297,4 @@ XSpadFillArcs(Display *dsply, Drawable drawable,XArc *arcs, int narcs, } -#endif /* MSYSplatform */ diff --git a/src/lib/bsdsignal.c b/src/lib/bsdsignal.c index 86c2b068..7cb3195c 100644 --- a/src/lib/bsdsignal.c +++ b/src/lib/bsdsignal.c @@ -1,6 +1,8 @@ /* Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. All rights reserved. + Copyright (C) Gabriel Dos Reis. + All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -32,13 +34,7 @@ */ #include "openaxiom-c-macros.h" - -#if defined(MACOSXplatform) -#include "/usr/include/signal.h" -#else #include -#endif - #include "bsdsignal.h" OPENAXIOM_EXPORT SignalHandlerFunc diff --git a/src/lib/edin.c b/src/lib/edin.c index 2e313a6a..ae4a3c0d 100644 --- a/src/lib/edin.c +++ b/src/lib/edin.c @@ -1,6 +1,8 @@ /* Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. All rights reserved. + Copyright (C) Gabriel Dos Reis. + All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -35,11 +37,7 @@ #include #include "openaxiom-c-macros.h" -#if defined(MACOSXplatform) -#include "/usr/include/unistd.h" -#else #include -#endif #include #include #include diff --git a/src/lib/fnct_key.c b/src/lib/fnct_key.c index b125fbca..d880a133 100644 --- a/src/lib/fnct_key.c +++ b/src/lib/fnct_key.c @@ -1,6 +1,8 @@ /* Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. All rights reserved. + Copyright (C) Gabriel Dos Reis. + All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -32,11 +34,7 @@ */ #include "openaxiom-c-macros.h" -#if defined(MACOSXplatform) -#include "/usr/include/unistd.h" -#else #include -#endif #include #include #include diff --git a/src/lib/util.c b/src/lib/util.c index b4946858..47362f7e 100644 --- a/src/lib/util.c +++ b/src/lib/util.c @@ -1,6 +1,8 @@ /* Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. All rights reserved. + Copyright (C) Gabriel Dos Reis. + All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -32,13 +34,7 @@ */ #include "openaxiom-c-macros.h" - -#include -#if defined(MACOSXplatform) -#include "/usr/include/unistd.h" -#else #include -#endif #include #include #include diff --git a/src/lib/wct.c b/src/lib/wct.c index 03568d63..0466d84b 100644 --- a/src/lib/wct.c +++ b/src/lib/wct.c @@ -1,6 +1,8 @@ /* Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. All rights reserved. + Copyright (C) Gabriel Dos Reis. + All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -43,18 +45,10 @@ #include #include -#if defined(MACOSXplatform) -#include "/usr/include/unistd.h" -#else #include -#endif #include #include -#if defined(MACOSXplatform) -#include "/usr/include/time.h" -#else #include -#endif #include #include #include -- cgit v1.2.3