NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit3f94ff5

committed

Allow contrib/dbase to compile if HAVE_ICONV_H it not defined. This is

only a partial solution but a step in the right direction.

1 parenteb36cdd commit3f94ff5Copy full SHA for 3f94ff5

File tree

1 file changed

+14

-0

lines changed

contrib/dbase
- dbf2pg.c

1 file changed

+14

-0

lines changed

`‎contrib/dbase/dbf2pg.c`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -742,12 +742,14 @@ main(int argc, char **argv)`
`742`	`742`	`case'U':`
`743`	`743`	`username= (char*)strdup(optarg);`
`744`	`744`	`break;`
	`745`	`+#ifdefHAVE_ICONV_H`
`745`	`746`	`case'F':`
`746`	`747`	`charset_from= (char*)strdup(optarg);`
`747`	`748`	`break;`
`748`	`749`	`case'T':`
`749`	`750`	`charset_to= (char*)strdup(optarg);`
`750`	`751`	`break;`
	`752`	`+#endif`
`751`	`753`	`case':':`
`752`	`754`	`usage();`
`753`	`755`	`printf("missing argument!\n");`
`@@ -806,8 +808,10 @@ main(int argc, char **argv)`
`806`	`808`	`free(username);`
`807`	`809`	`if (password)`
`808`	`810`	`free(password);`
	`811`	`+#ifdefHAVE_ICONV_H`
`809`	`812`	`if (charset_from)`
`810`	`813`	`iconv_close(iconv_d);`
	`814`	`+#endif`
`811`	`815`	`exit(1);`
`812`	`816`	`}`
`813`	`817`
`@@ -846,8 +850,10 @@ main(int argc, char **argv)`
`846`	`850`	`free(username);`
`847`	`851`	`if (password)`
`848`	`852`	`free(password);`
	`853`	`+#ifdefHAVE_ICONV_H`
`849`	`854`	`if (charset_from)`
`850`	`855`	`iconv_close(iconv_d);`
	`856`	`+#endif`
`851`	`857`	`exit(1);`
`852`	`858`	`}`
`853`	`859`
`@@ -864,8 +870,10 @@ main(int argc, char **argv)`
`864`	`870`	`free(username);`
`865`	`871`	`if (password)`
`866`	`872`	`free(password);`
	`873`	`+#ifdefHAVE_ICONV_H`
`867`	`874`	`if (charset_from)`
`868`	`875`	`iconv_close(iconv_d);`
	`876`	`+#endif`
`869`	`877`	`exit(1);`
`870`	`878`	`}`
`871`	`879`	`if (del)`
`@@ -880,8 +888,10 @@ main(int argc, char **argv)`
`880`	`888`	`free(username);`
`881`	`889`	`if (password)`
`882`	`890`	`free(password);`
	`891`	`+#ifdefHAVE_ICONV_H`
`883`	`892`	`if (charset_from)`
`884`	`893`	`iconv_close(iconv_d);`
	`894`	`+#endif`
`885`	`895`	`exit(1);`
`886`	`896`	`}`
`887`	`897`	`if (verbose>1)`
`@@ -903,8 +913,10 @@ main(int argc, char **argv)`
`903`	`913`	`free(username);`
`904`	`914`	`if (password)`
`905`	`915`	`free(password);`
	`916`	`+#ifdefHAVE_ICONV_H`
`906`	`917`	`if (charset_from)`
`907`	`918`	`iconv_close(iconv_d);`
	`919`	`+#endif`
`908`	`920`	`exit(1);`
`909`	`921`	`}`
`910`	`922`	`if (verbose>1)`
`@@ -933,7 +945,9 @@ main(int argc, char **argv)`
`933`	`945`	`free(username);`
`934`	`946`	`if (password)`
`935`	`947`	`free(password);`
	`948`	`+#ifdefHAVE_ICONV_H`
`936`	`949`	`if (charset_from)`
`937`	`950`	`iconv_close(iconv_d);`
	`951`	`+#endif`
`938`	`952`	`exit(0);`
`939`	`953`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit3f94ff5

File tree

1 file changed

1 file changed

`‎contrib/dbase/dbf2pg.c`

0 commit comments