advdlg.h   advdlg.h 
skipping to change at line 33 skipping to change at line 33
#define ADVDLG_H #define ADVDLG_H
#include "ui_advui.h" #include "ui_advui.h"
class AdvDlg: public QDialog { class AdvDlg: public QDialog {
Q_OBJECT Q_OBJECT
public: public:
AdvDlg(QWidget* parent, AdvDlg(QWidget* parent,
bool &synthShortNames_, bool &synthShortNames_,
bool &enableCharSetXform_,
bool &previewGmap_, bool &previewGmap_,
int &debugLevel_); int &debugLevel_);
QPushButton* formatButton() { return ui_.formatButton; }; QPushButton* formatButton() { return ui_.formatButton; };
private: private:
Ui_AdvUi ui_; Ui_AdvUi ui_;
bool &synthShortNames_; bool &synthShortNames_;
bool &enableCharSetXform_;
bool &previewGmap_; bool &previewGmap_;
int &debugLevel_; int &debugLevel_;
protected: protected:
private slots: private slots:
void acceptClicked(); void acceptClicked();
void rejectClicked(); void rejectClicked();
}; };
 End of changes. 2 change blocks. 
2 lines changed or deleted 0 lines changed or added


 config.h   config.h 
skipping to change at line 43 skipping to change at line 43
/* Define to 1 if you have the <memory.h> header file. */ /* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1 #define HAVE_MEMORY_H 1
/* Define to 1 if you have the `nanosleep' function. */ /* Define to 1 if you have the `nanosleep' function. */
#define HAVE_NANOSLEEP 1 #define HAVE_NANOSLEEP 1
/* Define to 1 if you have the `sleep' function. */ /* Define to 1 if you have the `sleep' function. */
#define HAVE_SLEEP 1 #define HAVE_SLEEP 1
/* Define to 1 if you have the <stdarg.h> header file. */
#define HAVE_STDARG_H 1
/* Define to 1 if you have the <stdint.h> header file. */ /* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1 #define HAVE_STDINT_H 1
/* Define to 1 if you have the <stdlib.h> header file. */ /* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1 #define HAVE_STDLIB_H 1
/* Define to 1 if you have the <strings.h> header file. */ /* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1 #define HAVE_STRINGS_H 1
/* Define to 1 if you have the <string.h> header file. */ /* Define to 1 if you have the <string.h> header file. */
skipping to change at line 67 skipping to change at line 70
/* Define to 1 if you have the <sys/types.h> header file. */ /* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_TYPES_H 1
/* Define to 1 if you have the `uname' function. */ /* Define to 1 if you have the `uname' function. */
#define HAVE_UNAME 1 #define HAVE_UNAME 1
/* Define to 1 if you have the <unistd.h> header file. */ /* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1 #define HAVE_UNISTD_H 1
/* Define if we have va_copy */
#define HAVE_VA_COPY 1
/* Define as 1 if your va_list type is an array */
/* #undef HAVE_VA_LIST_AS_ARRAY */
/* Defined if you have Windows DDK */ /* Defined if you have Windows DDK */
/* #undef HAVE_WDK */ /* #undef HAVE_WDK */
/* Define if we have __va_copy */
#define HAVE___VA_COPY 1
/* 1 to enable as many formats as possible */ /* 1 to enable as many formats as possible */
#define MAXIMAL_ENABLED 1 #define MAXIMAL_ENABLED 1
/* Define to the address where bug reports for this package should be sent. */ /* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "BUG-REPORT-ADDRESS" #define PACKAGE_BUGREPORT "BUG-REPORT-ADDRESS"
/* Define to the full name of this package. */ /* Define to the full name of this package. */
#define PACKAGE_NAME "GPSBabel" #define PACKAGE_NAME "GPSBabel"
/* Define to the release name of this package. */ /* Define to the release name of this package. */
#define PACKAGE_RELEASE "" #define PACKAGE_RELEASE ""
/* Define to the full name and version of this package. */ /* Define to the full name and version of this package. */
#define PACKAGE_STRING "GPSBabel 1.5.0" #define PACKAGE_STRING "GPSBabel 1.5.1"
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "gpsbabel" #define PACKAGE_TARNAME "gpsbabel"
/* Define to the home page for this package. */ /* Define to the home page for this package. */
#define PACKAGE_URL "" #define PACKAGE_URL ""
/* Define to the version of this package. */ /* Define to the version of this package. */
#define PACKAGE_VERSION "1.5.0" #define PACKAGE_VERSION "1.5.1"
/* 1 to enable Palm PDB support */ /* 1 to enable Palm PDB support */
#define PDBFMTS_ENABLED 1 #define PDBFMTS_ENABLED 1
/* 1 to enable shapefile support */ /* 1 to enable shapefile support */
#define SHAPELIB_ENABLED 1 #define SHAPELIB_ENABLED 1
/* Define to 1 if you have the ANSI C header files. */ /* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1 #define STDC_HEADERS 1
 End of changes. 5 change blocks. 
11 lines changed or deleted 5 lines changed or added


 defs.h   defs.h 
skipping to change at line 138 skipping to change at line 138
* Toss in some GNU C-specific voodoo for checking. * Toss in some GNU C-specific voodoo for checking.
*/ */
#if __GNUC__ #if __GNUC__
# define PRINTFLIKE(x,y) __attribute__ ((__format__ (__printf__, (x), (y)) )) # define PRINTFLIKE(x,y) __attribute__ ((__format__ (__printf__, (x), (y)) ))
# define NORETURN void __attribute__ ((__noreturn__)) # define NORETURN void __attribute__ ((__noreturn__))
#else #else
# define PRINTFLIKE(x,y) # define PRINTFLIKE(x,y)
# define NORETURN void # define NORETURN void
#endif #endif
#ifndef HAVE_VA_COPY
# ifdef __va_copy
# define va_copy(DEST,SRC) __va_copy((DEST),(SRC))
# else
# ifdef HAVE_VA_LIST_AS_ARRAY
# define va_copy(DEST,SRC) (*(DEST) = *(SRC))
# else
# define va_copy(DEST,SRC) ((DEST) = (SRC))
# endif
# endif
#endif
/* /*
* Common definitions. There should be no protocol or file-specific * Common definitions. There should be no protocol or file-specific
* data in this file. * data in this file.
*/ */
#define BASE_STRUCT(memberp, struct_type, member_name) \ #define BASE_STRUCT(memberp, struct_type, member_name) \
((struct_type *)((char *)(memberp) - offsetof(struct_type, member_name)) ) ((struct_type *)((char *)(memberp) - offsetof(struct_type, member_name)) )
typedef enum { typedef enum {
fix_unknown=-1, fix_unknown=-1,
 End of changes. 1 change blocks. 
12 lines changed or deleted 0 lines changed or added


 gbversion.h   gbversion.h 
/* /*
* gbversion.h is generated from gbversion.h.in which uses autoconf voodoo * gbversion.h is generated from gbversion.h.in which uses autoconf voodoo
* to get the version number from configure.in. * to get the version number from configure.in.
* *
* Isn't simplification via automation grand? * Isn't simplification via automation grand?
*/ */
#define VERSION "1.5.0" #define VERSION "1.5.1"
#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-1.5.0" #define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-1.5.1"
 End of changes. 1 change blocks. 
0 lines changed or deleted 0 lines changed or added


 gps.h   gps.h 
skipping to change at line 265 skipping to change at line 265
#include "gpsinput.h" #include "gpsinput.h"
#include "gpsproj.h" #include "gpsproj.h"
extern time_t gps_save_time; extern time_t gps_save_time;
extern double gps_save_lat; extern double gps_save_lat;
extern double gps_save_lon; extern double gps_save_lon;
extern int32 gps_save_id; extern int32 gps_save_id;
extern double gps_save_version; extern double gps_save_version;
extern char gps_save_string[GPS_ARB_LEN]; extern char gps_save_string[GPS_ARB_LEN];
extern int gps_is_usb; extern int gps_is_usb;
extern int gps_baud_rate;
extern struct COMMANDDATA COMMAND_ID[2]; extern struct COMMANDDATA COMMAND_ID[2];
extern struct LINKDATA LINK_ID[3]; extern struct LINKDATA LINK_ID[3];
extern struct GPS_MODEL_PROTOCOL GPS_MP[]; extern struct GPS_MODEL_PROTOCOL GPS_MP[];
extern char* gps_marine_sym[]; extern char* gps_marine_sym[];
extern char* gps_land_sym[]; extern char* gps_land_sym[];
extern char* gps_aviation_sym[]; extern char* gps_aviation_sym[];
extern char* gps_16_sym[]; extern char* gps_16_sym[];
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 gpsapp.h   gpsapp.h 
skipping to change at line 112 skipping to change at line 112
Capability A902: Capability A902:
Capability A903: Capability A903:
Capability A907: D907 D908 D909 D910 Capability A907: D907 D908 D909 D910
Capability A918: D918 Capability A918: D918
Capability A1013: D1014 Capability A1013: D1014
*/ */
const char* Get_Pkt_Type(US p, US d0, const char** xinfo); const char* Get_Pkt_Type(US p, US d0, const char** xinfo);
void GPS_Prepare_Track_For_Device(GPS_PTrack** trk, int32* n); void GPS_Prepare_Track_For_Device(GPS_PTrack** trk, int32* n);
int32 GPS_Set_Baud_Rate(const char* port, int br);
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 gpsserial.h   gpsserial.h 
#ifndef gpsserial_h #ifndef gpsserial_h
#define gpsserial_h #define gpsserial_h
#include "gps.h" #include "gps.h"
#define usecDELAY 180000 /* Microseconds before GPS sends A001 */ #define usecDELAY 180000 /* Microseconds before GPS sends A001 */
#define DEFAULT_BAUD 9600
int32 GPS_Serial_Chars_Ready(gpsdevh* fd); int32 GPS_Serial_Chars_Ready(gpsdevh* fd);
// int32 GPS_Serial_Close(int32 fd, const char *port); // int32 GPS_Serial_Close(int32 fd, const char *port);
// int32 GPS_Serial_Open(int32 *fd, const char *port); // int32 GPS_Serial_Open(int32 *fd, const char *port);
// int32 GPS_Serial_Open_NMEA(int32 *fd, const char *port); // int32 GPS_Serial_Open_NMEA(int32 *fd, const char *port);
// int32 GPS_Serial_Restoretty(const char *port); // int32 GPS_Serial_Restoretty(const char *port);
// int32 GPS_Serial_Savetty(const char *port); // int32 GPS_Serial_Savetty(const char *port);
int32 GPS_Serial_On(const char* port, gpsdevh** fd); int32 GPS_Serial_On(const char* port, gpsdevh** fd);
int32 GPS_Serial_Off(gpsdevh* fd); int32 GPS_Serial_Off(gpsdevh* fd);
int32 GPS_Serial_Wait(gpsdevh* fd); int32 GPS_Serial_Wait(gpsdevh* fd);
int32 GPS_Serial_Flush(gpsdevh* fd); int32 GPS_Serial_Flush(gpsdevh* fd);
// int32 GPS_Serial_On_NMEA(const char *port, gpsdevh **fd); // int32 GPS_Serial_On_NMEA(const char *port, gpsdevh **fd);
int32 GPS_Serial_Read(gpsdevh* fd, void* ibuf, int size); int32 GPS_Serial_Read(gpsdevh* fd, void* ibuf, int size);
int32 GPS_Serial_Write(gpsdevh* fd, const void* obuf, int size); int32 GPS_Serial_Write(gpsdevh* fd, const void* obuf, int size);
int32 GPS_Serial_Write_Packet(gpsdevh* fd, GPS_PPacket& packet); int32 GPS_Serial_Write_Packet(gpsdevh* fd, GPS_PPacket& packet);
int32 GPS_Serial_Send_Ack(gpsdevh* fd, GPS_PPacket* tra, GPS_PPacket* re c); int32 GPS_Serial_Send_Ack(gpsdevh* fd, GPS_PPacket* tra, GPS_PPacket* re c);
void GPS_Serial_Error(const char* hdr, ...); void GPS_Serial_Error(const char* hdr, ...);
int32 GPS_Serial_Set_Baud_Rate(gpsdevh* fd, int br);
#endif #endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/