Remove pm_c_util.h from sshopt.h

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@871 9d0c8265-081b-0410-96cb-a4ca84ce46f8

2 files changed, 2 insertions, 11 deletions

diff --git a/lib/libpbm1.c b/lib/libpbm1.c
index 5d0df7a1..fc20071c 100644
--- a/lib/libpbm1.c
+++ b/lib/libpbm1.c
@@ -18,6 +18,7 @@
 
 #include <stdio.h>
 
+#include "pm_c_util.h"
 #include "mallocvar.h"
 #include "shhopt.h"
 #include "pbm.h"
diff --git a/lib/util/shhopt.h b/lib/util/shhopt.h
index e5f05b90..99096a76 100644
--- a/lib/util/shhopt.h
+++ b/lib/util/shhopt.h
@@ -1,4 +1,4 @@
-/*==============================================================================
+/*=============================================================================
 HERE IS AN EXAMPLE OF THE USE OF SHHOPT:
 
 
@@ -232,14 +232,4 @@ optDestroyNameValueList(struct optNameValue * const list);
 }
 #endif
 
-/* Here's a hack to help us introduce pm_c_util.h.  That should be
-   #included in nearly every Netpbm program, but we're too lazy to insert
-   it into hundreds of files right now.  But shhopt.h is included into
-   most of those files, so we #include it here!
-
-   Before 2005.12.03, the stuff that is now in pm_c_util.h was in pm.h,
-   but that's a bad place for it because pm.h is an external header file.
-*/
-#include "pm_c_util.h"
-
 #endif