NetBSD port

cde/programs/dtcm/dtcm/cm_i18n.c

@@ -68,13 +68,6 @@ should be fixed in the future.
 #include <locale.h>
 #include <sys/param.h>       /* for MAXPATHLEN */
 #include <Xm/Xm.h>
-#include "util.h"
-#include "timeops.h"
-#include "cm_i18n.h"
-#include "deskset.h"
-/*
-#include "gettext.h"
-*/
 
 #include <langinfo.h>
 /* Iconv not defined for linux.  Use the EUSCompat stubs instead. */
@@ -83,6 +76,14 @@ should be fixed in the future.
 #endif
 #include <EUSCompat.h>
 
+#include "util.h"
+#include "timeops.h"
+#include "cm_i18n.h"
+#include "deskset.h"
+/*
+#include "gettext.h"
+*/
+
 char *fontset1[2]; 
 char *fontset2[2];
 int use_octal = FALSE;

cde/programs/dtcm/server/v4ops.c

@@ -37,7 +37,11 @@
 #include <pwd.h>
 #include <time.h>
 #if defined(CSRG_BASED)
+#if defined(__NetBSD__)
+#include <limits.h>
+#else
 #include <sys/limits.h>
+#endif
 #define MAXINT INT_MAX
 #else
 #include <values.h>