diff
上传用户:weiliju62
上传日期:2007-01-06
资源大小:619k
文件大小:2k
源码类别:

SCSI/ASPI

开发平台:

MultiPlatform

  1. diff -r ./DEFAULTS/Defaults.linux ../../cdrecord-1.8/DEFAULTS/Defaults.linux
  2. 30c30
  3. < INS_BASE= /usr/local
  4. ---
  5. > INS_BASE= /opt/schily
  6. diff -r ./RULES/rules.lib ../../cdrecord-1.8/RULES/rules.lib
  7. 43c43
  8. < #include $(SRCROOT)/$(RULESDIR)/rules.cnf
  9. ---
  10. > include $(SRCROOT)/$(RULESDIR)/rules.cnf
  11. diff -r ./RULES/rules.mks ../../cdrecord-1.8/RULES/rules.mks
  12. 38c38
  13. < #include $(SRCROOT)/$(RULESDIR)/rules.cnf
  14. ---
  15. > include $(SRCROOT)/$(RULESDIR)/rules.cnf
  16. diff -r ./include/schily.h ../../cdrecord-1.8/include/schily.h
  17. 1c1
  18. < /* @(#)schily.h 1.21 99/08/12 Copyright 1985 J. Schilling */
  19. ---
  20. > /* @(#)schily.h 1.22 99/08/30 Copyright 1985 J. Schilling */
  21. 51,54d50
  22. < #ifdef __cplusplus
  23. < extern "C" {
  24. < #endif
  25. 159a156,164
  26. > #ifdef EOF /* stdio.h has been included */
  27. > extern int js_fprintf __PR((FILE *, const char *, ...));
  28. > extern int js_printf __PR((const char *, ...));
  29. > #ifdef HAVE_SIZE_T
  30. > extern int js_snprintf __PR((char *, size_t, const char *, ...));
  31. > #endif
  32. > extern int js_sprintf __PR((char *, const char *, ...));
  33. > #endif /* EOF */
  34. 166,169d170
  35. < #ifdef __cplusplus
  36. < }
  37. < #endif
  38. diff -r ./include/standard.h ../../cdrecord-1.8/include/standard.h
  39. 97d96
  40. < #ifndef __cplusplus
  41. 99d97
  42. < #endif
  43. diff -r ./libscg/scg/scsitransp.h ../../cdrecord-1.8/libscg/scg/scsitransp.h
  44. 1c1
  45. < /* @(#)scsitransp.h 1.22 99/08/08 Copyright 1995 J. Schilling */
  46. ---
  47. > /* @(#)scsitransp.h 1.24 99/09/07 Copyright 1995 J. Schilling */
  48. 30a31
  49. >  int flags; /* Libscg flags (see below) */
  50. 42a44
  51. >  int error; /* libscg error number */
  52. 48a51,52
  53. >  char *errstr; /* Error string for scsi_open/sendmcd */
  54. >  char *errptr; /* Actual write pointer into errstr */
  55. 55c59
  56. <  * From scsitransp.c:
  57. ---
  58. >  * Flags for struct SCSI:
  59. 57,59c61,69
  60. < #ifdef __cplusplus
  61. < extern "C" {
  62. < #endif
  63. ---
  64. > /* NONE yet */
  65. > #define SCSI_ERRSTR_SIZE 4096
  66. > /*
  67. >  * Libscg error codes:
  68. >  */
  69. > #define SCG_ERRBASE 1000000
  70. > #define SCG_NOMEM 1000001
  71. 60a71,73
  72. > /*
  73. >  * From scsitransp.c:
  74. >  */
  75. 64a78
  76. > extern int scsi_initiator_id __PR((SCSI *scgp));
  77. 102c116
  78. < extern SCSI *open_scsi __PR((char *scsidev, int debug, int be_verbose));
  79. ---
  80. > extern SCSI *open_scsi __PR((char *scsidev, char *errs, int slen, int debug, int be_verbose));
  81. 107,110d120
  82. < #ifdef __cplusplus
  83. < }
  84. < #endif