From 30357bade4ba51536bdf52d60db2a3c96251a1ff Mon Sep 17 00:00:00 2001 From: bernhardheld Date: Mon, 3 Nov 2003 21:42:40 +0000 Subject: [PATCH] Use headers defined in the C[++] standards: * sim/ucsim/gui.src/serio.src/fileio.cc * sim/ucsim/gui.src/serio.src/frontend.cc * sim/ucsim/gui.src/serio.src/main.cc * sim/ucsim/gui.src/serio.src/posix_signal.cc * support/Util/NewAlloc.c * as/hc08/lklibr.c * as/mcs51/lklibr.c * as/z80/aslist.c * as/z80/assym.c git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@2989 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- ChangeLog | 13 +++++++++++ as/hc08/lklibr.c | 2 +- as/mcs51/lklibr.c | 2 +- as/z80/aslist.c | 2 ++ as/z80/assym.c | 1 + sim/ucsim/gui.src/serio.src/fileio.cc | 26 ++++++++++----------- sim/ucsim/gui.src/serio.src/frontend.cc | 2 +- sim/ucsim/gui.src/serio.src/main.cc | 16 ++++++------- sim/ucsim/gui.src/serio.src/posix_signal.cc | 8 +++---- support/Util/NewAlloc.c | 2 +- 10 files changed, 45 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce81f2f0..c2fd9c5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2003-11-03 Bernhard Held + + Use headers defined in the C[++] standards: + * sim/ucsim/gui.src/serio.src/fileio.cc + * sim/ucsim/gui.src/serio.src/frontend.cc + * sim/ucsim/gui.src/serio.src/main.cc + * sim/ucsim/gui.src/serio.src/posix_signal.cc + * support/Util/NewAlloc.c + * as/hc08/lklibr.c + * as/mcs51/lklibr.c + * as/z80/aslist.c + * as/z80/assym.c + 2003-11-03 Jesus Calvino-Fraga * Added MSVC projects for hc08 assembler and linker: diff --git a/as/hc08/lklibr.c b/as/hc08/lklibr.c index 8ca45048..3982e03e 100644 --- a/as/hc08/lklibr.c +++ b/as/hc08/lklibr.c @@ -21,7 +21,7 @@ #if defined(__APPLE__) && defined(__MACH__) #include #include -#else +#elseif !defined(__FreeBSD__) #include #endif #include diff --git a/as/mcs51/lklibr.c b/as/mcs51/lklibr.c index 9f3df0d9..808dfc64 100644 --- a/as/mcs51/lklibr.c +++ b/as/mcs51/lklibr.c @@ -21,7 +21,7 @@ #if defined(__APPLE__) && defined(__MACH__) #include #include -#else +#elseif !defined(__FreeBSD__) #include #endif #include diff --git a/as/z80/aslist.c b/as/z80/aslist.c index e5344899..3a7d0a7f 100644 --- a/as/z80/aslist.c +++ b/as/z80/aslist.c @@ -16,6 +16,7 @@ #include #include #include +#include #if defined(__APPLE__) && defined(__MACH__) #include #include @@ -23,6 +24,7 @@ #include #endif + #include "asm.h" /*)Module aslist.c diff --git a/as/z80/assym.c b/as/z80/assym.c index db88a08a..dadce441 100644 --- a/as/z80/assym.c +++ b/as/z80/assym.c @@ -12,6 +12,7 @@ #include #include #include +#include #if defined(__APPLE__) && defined(__MACH__) #include #include diff --git a/sim/ucsim/gui.src/serio.src/fileio.cc b/sim/ucsim/gui.src/serio.src/fileio.cc index 8c653cfd..5d5924dc 100644 --- a/sim/ucsim/gui.src/serio.src/fileio.cc +++ b/sim/ucsim/gui.src/serio.src/fileio.cc @@ -3,7 +3,7 @@ * fileio.cc - file input and output * ******************************************************************************/ #include -#include +#include #include #include #include @@ -18,28 +18,28 @@ FileIO::FileIO() // make the input fifo if(mkfifo(DEF_INFILE, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH) == -1) { if(errno != EEXIST) { - cerr << "mkfifo(): Error number " << errno << " occourred: " << strerror(errno) << "\n"; + std::cerr << "mkfifo(): Error number " << errno << " occourred: " << strerror(errno) << "\n"; exit(-1); } } // the input fifo - non blocking if ((fdin = open(DEF_INFILE, O_RDONLY|O_NONBLOCK)) == -1) { - cerr << "open(): Error number " << errno << " occourred: " << strerror(errno) << "\n"; + std::cerr << "open(): Error number " << errno << " occourred: " << strerror(errno) << "\n"; exit(-1); } // make the output fifo if(mkfifo(DEF_OUTFILE, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH) == -1) { if(errno != EEXIST) { - cerr << "mkfifo(): Error number " << errno << " occourred: " << strerror(errno) << "\n"; + std::cerr << "mkfifo(): Error number " << errno << " occourred: " << strerror(errno) << "\n"; exit(-1); } } // the output fifo if ((fdout = open(DEF_OUTFILE, O_RDWR|O_NONBLOCK)) == -1) { - cerr << "open(): Error number " << errno << " occourred: " << strerror(errno) << "\n"; + std::cerr << "open(): Error number " << errno << " occourred: " << strerror(errno) << "\n"; exit(-1); } } @@ -49,28 +49,28 @@ FileIO::FileIO(char *infile, char *outfile) // make the input fifo if(mkfifo(infile, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH) == -1) { if(errno != EEXIST) { - cerr << "mkfifo(): Error number " << errno << " occourred: " << strerror(errno); + std::cerr << "mkfifo(): Error number " << errno << " occourred: " << strerror(errno); exit(-1); } } // the input fifo - non blocking if ((fdin = open(infile, O_RDONLY|O_NONBLOCK)) == -1) { - cerr << "open(): Error number " << errno << " occourred: " << strerror(errno); + std::cerr << "open(): Error number " << errno << " occourred: " << strerror(errno); exit(-1); } // make the output fifo if(mkfifo(outfile, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH) == -1) { if(errno != EEXIST) { - cerr << "mkfifo(): Error number " << errno << " occourred: " << strerror(errno); + std::cerr << "mkfifo(): Error number " << errno << " occourred: " << strerror(errno); exit(-1); } } // the output fifo if ((fdout = open(outfile, O_RDWR|O_NONBLOCK)) == -1) { - cerr << "open(): Error number " << errno << " occourred: " << strerror(errno); + std::cerr << "open(): Error number " << errno << " occourred: " << strerror(errno); exit(-1); } } @@ -88,7 +88,7 @@ int FileIO::SendByte(char b) if((ret = write(fdout, &b, 1)) != 1) { - cerr << "write(): Error number " << errno << " occourred: " << strerror(errno); + std::cerr << "write(): Error number " << errno << " occourred: " << strerror(errno); exit(-1); } @@ -104,7 +104,7 @@ int FileIO::RecvByte(char *b) if((ret == -1) && (errno != EAGAIN)) { - cerr << "read(): Error number " << errno << " occourred: " << strerror(errno); + std::cerr << "read(): Error number " << errno << " occourred: " << strerror(errno); exit(-1); } @@ -118,7 +118,7 @@ int FileIO::SendStr(char *str) if((ret = write(fdout, str, strlen(str))) != (int)strlen(str)) { - cerr << "write(): Error number " << errno << " occourred: " << strerror(errno); + std::cerr << "write(): Error number " << errno << " occourred: " << strerror(errno); exit(-1); } @@ -135,7 +135,7 @@ int FileIO::RecvStr(char *str) if((ret == -1) && (errno != EAGAIN)) { - cerr << "read(): Error number " << errno << " occourred: " << strerror(errno); + std::cerr << "read(): Error number " << errno << " occourred: " << strerror(errno); exit(-1); } diff --git a/sim/ucsim/gui.src/serio.src/frontend.cc b/sim/ucsim/gui.src/serio.src/frontend.cc index e0cf78d9..263787a6 100644 --- a/sim/ucsim/gui.src/serio.src/frontend.cc +++ b/sim/ucsim/gui.src/serio.src/frontend.cc @@ -3,7 +3,7 @@ * frontend.cc - the ncurses frontend * ******************************************************************************/ #include -#include +#include #include #include #include diff --git a/sim/ucsim/gui.src/serio.src/main.cc b/sim/ucsim/gui.src/serio.src/main.cc index 5ce36122..32e076f8 100644 --- a/sim/ucsim/gui.src/serio.src/main.cc +++ b/sim/ucsim/gui.src/serio.src/main.cc @@ -3,7 +3,7 @@ * main.cc - the main stuff * ******************************************************************************/ #include -#include +#include #include #include #include @@ -30,11 +30,11 @@ void HandleSig(int info) // usage void PrintUsage(char *progname) { -cout << "Usage: " << progname << " [-i ] [-o ] [-h]\n"; -cout << "-i \t is the pipe to the controllers' serial input\n"; -cout << "-o \t is the pipe to the controllers' serial output\n"; -cout << "-h\t\tshow the help\n"; -cout << "\nTim Hurman - t.hurman@virgin.net\n"; +std::cout << "Usage: " << progname << " [-i ] [-o ] [-h]\n"; +std::cout << "-i \t is the pipe to the controllers' serial input\n"; +std::cout << "-o \t is the pipe to the controllers' serial output\n"; +std::cout << "-h\t\tshow the help\n"; +std::cout << "\nTim Hurman - t.hurman@virgin.net\n"; exit(0); } @@ -62,7 +62,7 @@ int main(int argc, char **argv) errflg++; break; default: - cerr << "Invalid or unknown switch\n"; + std::cerr << "Invalid or unknown switch\n"; errflg++; break; } @@ -88,7 +88,7 @@ int main(int argc, char **argv) if(string[0] != 0) fobj->SendByte(string[0]); - + if(fobj->RecvStr(string) > 0) view->AddStrOutWin(string); diff --git a/sim/ucsim/gui.src/serio.src/posix_signal.cc b/sim/ucsim/gui.src/serio.src/posix_signal.cc index f9baf936..bd9cfc4d 100644 --- a/sim/ucsim/gui.src/serio.src/posix_signal.cc +++ b/sim/ucsim/gui.src/serio.src/posix_signal.cc @@ -11,7 +11,7 @@ */ #include -#include +#include #include /* header for waitpid() and various macros */ #include /* header for signal functions */ #include @@ -51,7 +51,7 @@ int SigHandler::SetSignal(int SIGNAL, SIG_PF ACTION) /* set the signal handler */ if(sigaction(SIGNAL, &act, NULL) < 0) { - cerr << "sigaction(): " << strerror(errno) << "\n"; + std::cerr << "sigaction(): " << strerror(errno) << "\n"; exit(-1); } @@ -74,7 +74,7 @@ int SigHandler::BlockSignal(int SIGNAL) /* block it */ if(sigprocmask(SIG_BLOCK, &set, NULL) < 0) { - cerr << "sigprocmask(): " << strerror(errno) << "\n"; + std::cerr << "sigprocmask(): " << strerror(errno) << "\n"; exit(-1); } @@ -97,7 +97,7 @@ int SigHandler::UnBlockSignal(int SIGNAL) /* block it */ if(sigprocmask(SIG_UNBLOCK, &set, NULL) < 0) { - cerr << "sigprocmask(): " << strerror(errno) << "\n"; + std::cerr << "sigprocmask(): " << strerror(errno) << "\n"; exit(-1); } diff --git a/support/Util/NewAlloc.c b/support/Util/NewAlloc.c index ff163999..264311bb 100644 --- a/support/Util/NewAlloc.c +++ b/support/Util/NewAlloc.c @@ -30,7 +30,7 @@ functions. #include #if defined(__APPLE__) && defined(__MACH__) #include -#else +#elseif !defined(__FreeBSD__) #include #endif #include -- 2.30.2