From 3e5aa1e1d1a0e1c28619c2388be8c1a0ae4fbeb9 Mon Sep 17 00:00:00 2001
From: jongfoster <jongfoster@users.sourceforge.net>
Date: Sun, 29 Jul 2001 18:43:08 +0000
Subject: [PATCH] Changing #ifdef _FILENAME_H to FILENAME_H_INCLUDED, to
 conform to ANSI C rules.

---
 amiga.h       | 12 ++++++++----
 cgi.h         | 11 +++++++----
 cygwin.h      | 13 ++++++++-----
 encode.h      | 13 ++++++++-----
 errlog.h      | 11 +++++++----
 list.h        | 12 ++++++++----
 miscutil.h    | 11 +++++++----
 parsers.h     | 11 +++++++----
 project.h     | 11 +++++++----
 ssplit.h      | 13 +++++++++----
 w32log.h      | 11 +++++++----
 w32res.h      | 11 +++++++----
 w32rulesdlg.h | 13 +++++++++----
 w32taskbar.h  | 13 ++++++++-----
 win32.h       | 13 ++++++++-----
 15 files changed, 115 insertions(+), 64 deletions(-)

diff --git a/amiga.h b/amiga.h
index 53933048..653a4165 100644
--- a/amiga.h
+++ b/amiga.h
@@ -1,7 +1,7 @@
 #ifdef AMIGA
-#ifndef _AMIGA_H
-#define _AMIGA_H
-#define AMIGA_H_VERSION "$Id: amiga.h,v 1.3 2001/05/25 21:53:27 jongfoster Exp $"
+#ifndef AMIGA_H_INCLUDED
+#define AMIGA_H_INCLUDED
+#define AMIGA_H_VERSION "$Id: amiga.h,v 1.4 2001/05/29 20:05:06 joergs Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/amiga.h,v $
@@ -31,6 +31,10 @@
  *
  * Revisions   :
  *    $Log: amiga.h,v $
+ *    Revision 1.4  2001/05/29 20:05:06  joergs
+ *    Fixed exit() macro not exiting if called before InitAmiga()
+ *    (junkbuster --help and --version).
+ *
  *    Revision 1.3  2001/05/25 21:53:27  jongfoster
  *    Fixing indentation
  *
@@ -100,5 +104,5 @@ __saveds ULONG server_thread(void);
 
 #define EINTR 0
 
-#endif /* ndef _AMIGA_H */
+#endif /* ndef AMIGA_H_INCLUDED */
 #endif /* def AMIGA */
diff --git a/cgi.h b/cgi.h
index fb6f5742..dfdfa459 100644
--- a/cgi.h
+++ b/cgi.h
@@ -1,6 +1,6 @@
-#ifndef _CGI_H
-#define _CGI_H
-#define CGI_H_VERSION "$Id: cgi.h,v 1.5 2001/06/29 13:22:44 oes Exp $"
+#ifndef CGI_H_INCLUDED
+#define CGI_H_INCLUDED
+#define CGI_H_VERSION "$Id: cgi.h,v 1.6 2001/06/29 21:45:41 oes Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgi.h,v $
@@ -38,6 +38,9 @@
  *
  * Revisions   :
  *    $Log: cgi.h,v $
+ *    Revision 1.6  2001/06/29 21:45:41  oes
+ *    Indentation, CRLF->LF, Tab-> Space
+ *
  *    Revision 1.5  2001/06/29 13:22:44  oes
  *    - Cleaned up
  *    - Added new functions: default_exports(), make_menu(),
@@ -136,7 +139,7 @@ extern const char cgi_h_rcs[];
 } /* extern "C" */
 #endif
 
-#endif /* ndef _CGI_H */
+#endif /* ndef CGI_H_INCLUDED */
 
 /*
   Local Variables:
diff --git a/cygwin.h b/cygwin.h
index 4568ea82..4cb2db8d 100644
--- a/cygwin.h
+++ b/cygwin.h
@@ -1,9 +1,9 @@
-#ifndef _CYGWIN_H
-#define _CYGWIN_H
-#define CYGWIN_H_VERSION "$Id: cygwin.h,v 1.1 2001/05/13 21:57:06 administrator Exp $"
+#ifndef CYGWIN_H_INCLUDED
+#define CYGWIN_H_INCLUDED
+#define CYGWIN_H_VERSION "$Id: cygwin.h,v 1.1.1.1 2001/05/15 13:58:51 oes Exp $"
 /*********************************************************************
  *
- * File        :  $Source: /home/administrator/cvs/ijb/cygwin.h,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/cygwin.h,v $
  *
  * Purpose     :  The windows.h file seems to be a *tad* different, so I
  *                will bridge the gaps here.  Perhaps I should convert the
@@ -36,6 +36,9 @@
  *
  * Revisions   :
  *    $Log: cygwin.h,v $
+ *    Revision 1.1.1.1  2001/05/15 13:58:51  oes
+ *    Initial import of version 2.9.3 source tree
+ *
  *
  *********************************************************************/
 
@@ -53,7 +56,7 @@
  */
 
 #endif /* def __MINGW32__ */
-#endif /* ndef _CYGWIN_H */
+#endif /* ndef CYGWIN_H_INCLUDED */
 
 
 /*
diff --git a/encode.h b/encode.h
index ba0b6cf0..60594d14 100644
--- a/encode.h
+++ b/encode.h
@@ -1,9 +1,9 @@
-#ifndef _ENCODE_H
-#define _ENCODE_H
-#define ENCODE_H_VERSION "$Id: encode.h,v 1.1 2001/05/13 21:57:06 administrator Exp $"
+#ifndef ENCODE_H_INCLUDED
+#define ENCODE_H_INCLUDED
+#define ENCODE_H_VERSION "$Id: encode.h,v 1.1.1.1 2001/05/15 13:58:51 oes Exp $"
 /*********************************************************************
  *
- * File        :  $Source: /home/administrator/cvs/ijb/encode.h,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/encode.h,v $
  *
  * Purpose     :  Functions to encode and decode URLs, and also to
  *                encode cookies and HTML text.
@@ -35,6 +35,9 @@
  *
  * Revisions   :
  *    $Log: encode.h,v $
+ *    Revision 1.1.1.1  2001/05/15 13:58:51  oes
+ *    Initial import of version 2.9.3 source tree
+ *
  *
  *********************************************************************/
 
@@ -56,7 +59,7 @@ extern const char encode_h_rcs[];
 } /* extern "C" */
 #endif
 
-#endif /* ndef _ENCODE_H */
+#endif /* ndef ENCODE_H_INCLUDED */
 
 /*
   Local Variables:
diff --git a/errlog.h b/errlog.h
index d5edaaef..207d67ea 100644
--- a/errlog.h
+++ b/errlog.h
@@ -1,6 +1,6 @@
-#ifndef _ERRLOG_H
-#define _ERRLOG_H
-#define ERRLOG_H_VERSION "$Id: errlog.h,v 1.6 2001/07/13 13:59:22 oes Exp $"
+#ifndef ERRLOG_H_INCLUDED
+#define ERRLOG_H_INCLUDED
+#define ERRLOG_H_VERSION "$Id: errlog.h,v 1.7 2001/07/19 19:02:53 haroon Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/errlog.h,v $
@@ -35,6 +35,9 @@
  *
  * Revisions   :
  *    $Log: errlog.h,v $
+ *    Revision 1.7  2001/07/19 19:02:53  haroon
+ *    Added define for LOG_LEVEL_POPUPS
+ *
  *    Revision 1.6  2001/07/13 13:59:22  oes
  *     - Added LOG_LEVEL_DEANIMATE
  *     - Changed LOG_LEVEL_CLF
@@ -143,7 +146,7 @@ extern const char errlog_h_rcs[];
 } /* extern "C" */
 #endif
 
-#endif /* ndef _ERRLOG_H */
+#endif /* ndef ERRLOG_H_INCLUDED */
 
 /*
   Local Variables:
diff --git a/list.h b/list.h
index bbaa5aa1..8cee8f62 100644
--- a/list.h
+++ b/list.h
@@ -1,6 +1,6 @@
-#ifndef _LIST_H
-#define _LIST_H
-#define LIST_H_VERSION "$Id: list.h,v 1.3 2001/06/03 11:03:48 oes Exp $"
+#ifndef LIST_H_INCLUDED
+#define LIST_H_INCLUDED
+#define LIST_H_VERSION "$Id: list.h,v 1.4 2001/06/29 13:30:37 oes Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/list.h,v $
@@ -36,6 +36,10 @@
  *
  * Revisions   :
  *    $Log: list.h,v $
+ *    Revision 1.4  2001/06/29 13:30:37  oes
+ *    - Introduced enlist_unique_header()
+ *    - Removed logentry from cancelled commit
+ *
  *    Revision 1.3  2001/06/03 11:03:48  oes
  *    introduced functions for new list type "map": map(), lookup(),
  *    free_map(), and extended enlist_unique
@@ -98,7 +102,7 @@ extern const char list_h_rcs[];
 } /* extern "C" */
 #endif
 
-#endif /* ndef _LIST_H */
+#endif /* ndef LIST_H_INCLUDED */
 
 /*
   Local Variables:
diff --git a/miscutil.h b/miscutil.h
index 2638be93..5598f3cd 100644
--- a/miscutil.h
+++ b/miscutil.h
@@ -1,6 +1,6 @@
-#ifndef _MISCUTIL_H
-#define _MISCUTIL_H
-#define MISCUTIL_H_VERSION "$Id: miscutil.h,v 1.7 2001/06/05 22:32:01 jongfoster Exp $"
+#ifndef MISCUTIL_H_INCLUDED
+#define MISCUTIL_H_INCLUDED
+#define MISCUTIL_H_VERSION "$Id: miscutil.h,v 1.8 2001/06/29 13:32:14 oes Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/miscutil.h,v $
@@ -37,6 +37,9 @@
  *
  * Revisions   :
  *    $Log: miscutil.h,v $
+ *    Revision 1.8  2001/06/29 13:32:14  oes
+ *    Removed logentry from cancelled commit
+ *
  *    Revision 1.7  2001/06/05 22:32:01  jongfoster
  *    New function make_path() to splice directory and file names together.
  *
@@ -121,7 +124,7 @@ extern const char miscutil_h_rcs[];
 }
 #endif
 
-#endif /* ndef _MISCUTIL_H */
+#endif /* ndef MISCUTIL_H_INCLUDED */
 
 /*
   Local Variables:
diff --git a/parsers.h b/parsers.h
index b68ee8db..d721ac4a 100644
--- a/parsers.h
+++ b/parsers.h
@@ -1,6 +1,6 @@
-#ifndef _PARSERS_H
-#define _PARSERS_H
-#define PARSERS_H_VERSION "$Id: parsers.h,v 1.7 2001/06/29 13:32:14 oes Exp $"
+#ifndef PARSERS_H_INCLUDED
+#define PARSERS_H_INCLUDED
+#define PARSERS_H_VERSION "$Id: parsers.h,v 1.8 2001/07/13 14:01:54 oes Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/parsers.h,v $
@@ -43,6 +43,9 @@
  *
  * Revisions   :
  *    $Log: parsers.h,v $
+ *    Revision 1.8  2001/07/13 14:01:54  oes
+ *    Removed all #ifdef PCRS
+ *
  *    Revision 1.7  2001/06/29 13:32:14  oes
  *    Removed logentry from cancelled commit
  *
@@ -135,7 +138,7 @@ extern const char parsers_h_rcs[];
 } /* extern "C" */
 #endif
 
-#endif /* ndef _PARSERS_H */
+#endif /* ndef PARSERS_H_INCLUDED */
 
 /*
   Local Variables:
diff --git a/project.h b/project.h
index 50a79590..efd6bef2 100644
--- a/project.h
+++ b/project.h
@@ -1,6 +1,6 @@
-#ifndef _PROJECT_H
-#define _PROJECT_H
-#define PROJECT_H_VERSION "$Id: project.h,v 1.23 2001/07/18 12:32:23 oes Exp $"
+#ifndef PROJECT_H_INCLUDED
+#define PROJECT_H_INCLUDED
+#define PROJECT_H_VERSION "$Id: project.h,v 1.24 2001/07/25 17:20:27 oes Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/project.h,v $
@@ -36,6 +36,9 @@
  *
  * Revisions   :
  *    $Log: project.h,v $
+ *    Revision 1.24  2001/07/25 17:20:27  oes
+ *    Introduced http->user_agent
+ *
  *    Revision 1.23  2001/07/18 12:32:23  oes
  *    - Added ACTION_STRING_DEANIMATE
  *    - moved #define freez from jcc.h to project.h
@@ -799,7 +802,7 @@ static const char CHEADER[] =
 } /* extern "C" */
 #endif
 
-#endif /* ndef _PROJECT_H */
+#endif /* ndef PROJECT_H_INCLUDED */
 
 /*
   Local Variables:
diff --git a/ssplit.h b/ssplit.h
index 757a98e2..e2ecc138 100644
--- a/ssplit.h
+++ b/ssplit.h
@@ -1,6 +1,6 @@
-#ifndef _SSPLIT_H
-#define _SSPLIT_H
-#define SSPLIT_H_VERSION "$Id: ssplit.h,v 1.1.1.1 2001/05/15 13:59:04 oes Exp $"
+#ifndef SSPLIT_H_INCLUDED
+#define SSPLIT_H_INCLUDED
+#define SSPLIT_H_VERSION "$Id: ssplit.h,v 1.2 2001/05/29 08:54:25 jongfoster Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/ssplit.h,v $
@@ -34,6 +34,11 @@
  *
  * Revisions   :
  *    $Log: ssplit.h,v $
+ *    Revision 1.2  2001/05/29 08:54:25  jongfoster
+ *    Rewrote the innards of ssplit() to be easier to understand,
+ *    faster, and to use less memory.  Didn't change the interface
+ *    except to give the parameters meaningful names.
+ *
  *    Revision 1.1.1.1  2001/05/15 13:59:04  oes
  *    Initial import of version 2.9.3 source tree
  *
@@ -56,7 +61,7 @@ extern const char ssplit_h_rcs[];
 } /* extern "C" */
 #endif
 
-#endif /* ndef _SSPLIT_H */
+#endif /* ndef SSPLIT_H_INCLUDED */
 
 /*
   Local Variables:
diff --git a/w32log.h b/w32log.h
index 3c40c481..6d15a674 100644
--- a/w32log.h
+++ b/w32log.h
@@ -1,6 +1,6 @@
-#ifndef _W32LOG_H
-#define _W32LOG_H
-#define W32LOG_H_VERSION "$Id: w32log.h,v 1.5 2001/06/07 23:08:12 jongfoster Exp $"
+#ifndef W32LOG_H_INCLUDED
+#define W32LOG_H_INCLUDED
+#define W32LOG_H_VERSION "$Id: w32log.h,v 1.6 2001/07/13 14:04:59 oes Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/w32log.h,v $
@@ -34,6 +34,9 @@
  *
  * Revisions   :
  *    $Log: w32log.h,v $
+ *    Revision 1.6  2001/07/13 14:04:59  oes
+ *    Removed all #ifdef PCRS
+ *
  *    Revision 1.5  2001/06/07 23:08:12  jongfoster
  *    Forward and ACL edit options removed.
  *
@@ -135,7 +138,7 @@ extern const char w32log_h_rcs[];
 } /* extern "C" */
 #endif
 
-#endif /* ndef _W32LOG_H */
+#endif /* ndef W32LOG_H_INCLUDED */
 
 
 /*
diff --git a/w32res.h b/w32res.h
index 33a37200..61c15519 100644
--- a/w32res.h
+++ b/w32res.h
@@ -1,6 +1,6 @@
-#ifndef _W32RES_H
-#define _W32RES_H
-#define W32RES_H_VERSION "$Id: w32res.h,v 1.7 2001/06/07 23:08:12 jongfoster Exp $"
+#ifndef W32RES_H_INCLUDED
+#define W32RES_H_INCLUDED
+#define W32RES_H_VERSION "$Id: w32res.h,v 1.8 2001/07/13 14:04:59 oes Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/w32res.h,v $
@@ -34,6 +34,9 @@
  *
  * Revisions   :
  *    $Log: w32res.h,v $
+ *    Revision 1.8  2001/07/13 14:04:59  oes
+ *    Removed all #ifdef PCRS
+ *
  *    Revision 1.7  2001/06/07 23:08:12  jongfoster
  *    Forward and ACL edit options removed.
  *
@@ -170,7 +173,7 @@
 #define ID_EDIT_COPY  30000
 
 
-#endif /* ndef _W32RES_H */
+#endif /* ndef W32RES_H_INCLUDED */
 
 /*
   Local Variables:
diff --git a/w32rulesdlg.h b/w32rulesdlg.h
index 9fe945de..97390e92 100644
--- a/w32rulesdlg.h
+++ b/w32rulesdlg.h
@@ -1,6 +1,6 @@
-#ifndef _W32RULESDLG_H
-#define _W32RULESDLG_H
-#define W32RULESDLG_H_VERSION "$Id: w32rulesdlg.h,v 1.1.1.1 2001/05/15 13:59:08 oes Exp $"
+#ifndef W32RULESDLG_H_INCLUDED
+#define W32RULESDLG_H_INCLUDED
+#define W32RULESDLG_H_VERSION "$Id: w32rulesdlg.h,v 1.2 2001/05/26 01:26:34 jongfoster Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/w32rulesdlg.h,v $
@@ -34,6 +34,11 @@
  *
  * Revisions   :
  *    $Log: w32rulesdlg.h,v $
+ *    Revision 1.2  2001/05/26 01:26:34  jongfoster
+ *    New #define, WIN_GUI_EDIT, enables the (embryonic) Win32 GUI editor.
+ *    This #define cannot be set from ./configure - there's no point, it
+ *    doesn't work yet.  See feature request # 425722
+ *
  *    Revision 1.1.1.1  2001/05/15 13:59:08  oes
  *    Initial import of version 2.9.3 source tree
  *
@@ -62,7 +67,7 @@ extern const char w32rulesdlg_h_rcs[];
 } /* extern "C" */
 #endif
 
-#endif /* ndef _W32RULESDLG_H */
+#endif /* ndef W32RULESDLG_H_INCLUDED */
 
 
 /*
diff --git a/w32taskbar.h b/w32taskbar.h
index 9ba21fbd..b51d9f30 100644
--- a/w32taskbar.h
+++ b/w32taskbar.h
@@ -1,9 +1,9 @@
-#ifndef _W32TASKBAR_H
-#define _W32TASKBAR_H
-#define W32TASKBAR_H_VERSION "$Id: w32taskbar.h,v 1.1 2001/05/13 21:57:07 administrator Exp $"
+#ifndef W32TASKBAR_H_INCLUDED
+#define W32TASKBAR_H_INCLUDED
+#define W32TASKBAR_H_VERSION "$Id: w32taskbar.h,v 1.1.1.1 2001/05/15 13:59:08 oes Exp $"
 /*********************************************************************
  *
- * File        :  $Source: /home/administrator/cvs/ijb/w32taskbar.h,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/w32taskbar.h,v $
  *
  * Purpose     :  Functions for creating, setting and destroying the
  *                workspace tray icon
@@ -34,6 +34,9 @@
  *
  * Revisions   :
  *    $Log: w32taskbar.h,v $
+ *    Revision 1.1.1.1  2001/05/15 13:59:08  oes
+ *    Initial import of version 2.9.3 source tree
+ *
  *
  *********************************************************************/
 
@@ -55,7 +58,7 @@ extern const char w32taskbar_h_rcs[];
 } /* extern "C" */
 #endif
 
-#endif /* ndef _W32TASKBAR_H */
+#endif /* ndef W32TASKBAR_H_INCLUDED */
 
 
 /*
diff --git a/win32.h b/win32.h
index 3011f478..da4164df 100644
--- a/win32.h
+++ b/win32.h
@@ -1,9 +1,9 @@
-#ifndef _WIN32_H
-#define _WIN32_H
-#define WIN32_H_VERSION "$Id: win32.h,v 1.1 2001/05/13 21:57:07 administrator Exp $"
+#ifndef WIN32_H_INCLUDED
+#define WIN32_H_INCLUDED
+#define WIN32_H_VERSION "$Id: win32.h,v 1.1.1.1 2001/05/15 13:59:08 oes Exp $"
 /*********************************************************************
  *
- * File        :  $Source: /home/administrator/cvs/ijb/win32.h,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/win32.h,v $
  *
  * Purpose     :  Win32 User Interface initialization and message loop
  *
@@ -33,6 +33,9 @@
  *
  * Revisions   :
  *    $Log: win32.h,v $
+ *    Revision 1.1.1.1  2001/05/15 13:59:08  oes
+ *    Initial import of version 2.9.3 source tree
+ *
  *
  *********************************************************************/
 
@@ -62,7 +65,7 @@ extern const char win32_h_rcs[];
 } /* extern "C" */
 #endif
 
-#endif /* ndef _WIN32_H */
+#endif /* ndef WIN32_H_INCLUDED */
 
 /*
   Local Variables:
-- 
2.39.2