No longer define `static' as nothing.

2 files changed, 10 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3719e00f228..868e007c863 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-15  Glenn Morris  <rgm@gnu.org>
+
+        * s/hpux.h: No longer define `static' as nothing.
+
 2007-09-14  Glenn Morris  <rgm@gnu.org>
 
         * fringe.c (init_fringe_bitmap) <swap nibble>: Move to file scope.
diff --git a/src/s/hpux.h b/src/s/hpux.h
index 5f407a661e1..1fb83a7a075 100644
--- a/src/s/hpux.h
+++ b/src/s/hpux.h
@@ -167,9 +167,13 @@ Boston, MA 02110-1301, USA.  */
 
 /* USG systems tend to put everything declared static
    into the initialized data area, which becomes pure after dumping Emacs.
-   Foil this.  Emacs carefully avoids static vars inside functions.  */
+   Foil this.  Emacs carefully avoids static vars inside functions.
+   http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg00368.html
+   As of at least HPUX 11.11 (2000), it seems this workaround is no
+   longer needed.  Try uncommenting the following if you have problems
+   on older versions.  */
 
-#define static
+/*#define static */
 
 /* Define extra libraries to load.
    This should have -lBSD, but that library is said to make