merge 64-bit fixes from Fernando Lucas Rodriguez <fernando_lr@terra.es>

[debian/gcpegg] / reg_orion.c

diff --git a/reg_orion.c b/reg_orion.c
index d6938ef30dca1810040a0c00f65a9293d8141cfc..c88ac38d0eb2cfa9a5167b4b4c04bbea75b4d324 100644 (file)
--- a/reg_orion.c
+++ b/reg_orion.c
@@ -111,11 +111,11 @@ static int32 OpenDev(DevOpts *opts) {
   case 115200: baudcon = B115200; break;
 #endif
   default:
-    printf("%s: Baud rate %ld not supported.\n", pgmname, opts->baud);
+    printf("%s: Baud rate %d not supported.\n", pgmname, opts->baud);
     return -1;
   }
 
-  fprintf(stderr, "Opening %s at %ld\n", ttydev, opts->baud);
+  fprintf(stderr, "Opening %s at %d\n", ttydev, opts->baud);
   if ((TTY_fd = open(ttydev, O_RDONLY
 #ifdef CPU_BOUND
                                    | O_NDELAY
@@ -147,7 +147,9 @@ fprintf(stderr, "Error in open(%s)\n", ttydev);
 #else
   res = cfsetospeed(&tt, baudcon); 
   cfmakeraw(&tt);
+#if !defined(__FreeBSD_kernel__)
   tt.c_oflag &= (~(TABDLY | ONLCR));
+#endif
 #endif
   res = tcsetattr(TTY_fd, TCSANOW, &tt);