From 22549b4cb0f285b7a21537e493497fc28bc76f0d Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@lysator.liu.se>
Date: Wed, 2 Aug 2006 17:02:40 +0200
Subject: [PATCH] Ensure machine.h only is included through global.h.

Rev: src/language.yacc:1.372
Rev: src/pike_error.h:1.39
Rev: src/pike_threadlib.h:1.60
Rev: src/threads.h:1.131
Rev: src/time_stuff.h:1.16
---
 src/language.yacc    | 3 +--
 src/pike_error.h     | 4 ++--
 src/pike_threadlib.h | 4 ++--
 src/threads.h        | 3 +--
 src/time_stuff.h     | 7 ++-----
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/language.yacc b/src/language.yacc
index fac5c5b0da..376abf9b11 100644
--- a/src/language.yacc
+++ b/src/language.yacc
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: language.yacc,v 1.371 2006/07/06 16:46:13 grubba Exp $
+|| $Id: language.yacc,v 1.372 2006/08/02 15:02:40 mast Exp $
 */
 
 %pure_parser
@@ -133,7 +133,6 @@
 #include "pike_macros.h"
 #include "pike_error.h"
 #include "docode.h"
-#include "machine.h"
 #include "pike_embed.h"
 #include "opcodes.h"
 #include "operators.h"
diff --git a/src/pike_error.h b/src/pike_error.h
index 5bdfa4f657..76e3ea57dd 100644
--- a/src/pike_error.h
+++ b/src/pike_error.h
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: pike_error.h,v 1.38 2006/05/10 19:43:54 mast Exp $
+|| $Id: pike_error.h,v 1.39 2006/08/02 15:02:40 mast Exp $
 */
 
 #ifndef PIKE_ERROR_H
@@ -26,7 +26,7 @@ static inline void Pike_fatal (const char *fmt, ...)
 
 #else  /* !CONFIGURE_TEST */
 
-#include "machine.h"
+#include "global.h"
 
 #ifdef HAVE_SETJMP_H
 #include <setjmp.h>
diff --git a/src/pike_threadlib.h b/src/pike_threadlib.h
index 72fd996627..0ecacdb683 100644
--- a/src/pike_threadlib.h
+++ b/src/pike_threadlib.h
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: pike_threadlib.h,v 1.59 2006/07/05 02:17:09 mast Exp $
+|| $Id: pike_threadlib.h,v 1.60 2006/08/02 15:02:40 mast Exp $
 */
 
 #ifndef PIKE_THREADLIB_H
@@ -16,7 +16,7 @@
 
 
 #ifndef CONFIGURE_TEST
-#include "machine.h"
+#include "global.h"
 #include "pike_embed.h"
 #include "pike_rusage.h"
 #endif
diff --git a/src/threads.h b/src/threads.h
index d586c2eeda..653bad2c3d 100644
--- a/src/threads.h
+++ b/src/threads.h
@@ -2,13 +2,12 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: threads.h,v 1.130 2004/12/30 13:50:35 grubba Exp $
+|| $Id: threads.h,v 1.131 2006/08/02 15:02:40 mast Exp $
 */
 
 #ifndef THREADS_H
 #define THREADS_H
 
-#include "machine.h"
 #include "object.h"
 #include "pike_error.h"
 #include "interpret.h"
diff --git a/src/time_stuff.h b/src/time_stuff.h
index 527e781d4d..3e6d26d570 100644
--- a/src/time_stuff.h
+++ b/src/time_stuff.h
@@ -2,15 +2,13 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: time_stuff.h,v 1.15 2006/06/20 17:53:04 mast Exp $
+|| $Id: time_stuff.h,v 1.16 2006/08/02 15:02:40 mast Exp $
 */
 
 #ifndef TIME_STUFF_H
 #define TIME_STUFF_H
 
-#ifndef CONFIGURE_TEST
-#include "machine.h"
-#endif
+#include "global.h"
 
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
@@ -80,5 +78,4 @@ struct timeval
 };
 #endif
 
-
 #endif
-- 
GitLab