Commit571d121

Thomas G. Lockhart

committed

Fix macro declarations to allow disabling mylog() and qlog() on Unix boxes.

Fix spelling of "DIRSEPARATOR".

1 parentf4ccb5e commit571d121Copy full SHA for 571d121

File tree

+27

-19

lines changed

+27

-19

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ generate_filename(char* dirname,char* prefix,char* filename)`
`44`	`44`	`return;`
`45`	`45`
`46`	`46`	`strcpy(filename,dirname);`
`47`		`-strcat(filename,DIRSEPERATOR);`
	`47`	`+strcat(filename,DIRSEPARATOR);`
`48`	`48`	`if(prefix!=0)`
`49`	`49`	`strcat(filename,prefix);`
`50`	`50`	`#ifndefWIN32`

Lines changed: 26 additions & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,33 +39,41 @@`
`39`	`39`
`40`	`40`
`41`	`41`	`#ifdefMY_LOG`
`42`		`-#defineMYLOGFILE"mylog_"`
`43`		`-#ifndefWIN32`
`44`		`-#defineMYLOGDIR"/tmp"`
`45`		`-#else`
`46`		`-#defineMYLOGDIR"c:"`
`47`		`-#endif`
`48`		`-voidmylog();/* prototype */`
	`42`	`+#defineMYLOGFILE"mylog_"`
	`43`	`+#ifndefWIN32`
	`44`	`+#defineMYLOGDIR"/tmp"`
	`45`	`+#else`
	`46`	`+#defineMYLOGDIR"c:"`
	`47`	`+#endif`
	`48`	`+voidmylog();/* prototype */`
`49`	`49`	`#else`
`50`		`-#definemylog// mylog`
	`50`	`+#ifndefWIN32`
	`51`	`+#definemylog(args...)/* GNU convention for variable arguments */`
	`52`	`+#else`
	`53`	`+#definemylog// mylog`
	`54`	`+#endif`
`51`	`55`	`#endif`
`52`	`56`
`53`	`57`	`#ifdefQ_LOG`
`54`		`-#defineQLOGFILE"psqlodbc_"`
`55`		`-#ifndefWIN32`
`56`		`-#defineQLOGDIR"/tmp"`
`57`		`-#else`
`58`		`-#defineQLOGDIR"c:"`
`59`		`-#endif`
`60`		`-voidqlog();/* prototype */`
	`58`	`+#defineQLOGFILE"psqlodbc_"`
	`59`	`+#ifndefWIN32`
	`60`	`+#defineQLOGDIR"/tmp"`
	`61`	`+#else`
	`62`	`+#defineQLOGDIR"c:"`
	`63`	`+#endif`
	`64`	`+voidqlog();/* prototype */`
`61`	`65`	`#else`
`62`		`-#defineqlog// qlog`
	`66`	`+#ifndefWIN32`
	`67`	`+#defineqlog(args...)/* GNU convention for variable arguments */`
	`68`	`+#else`
	`69`	`+#defineqlog// qlog`
	`70`	`+#endif`
`63`	`71`	`#endif`
`64`	`72`
`65`	`73`	`#ifndefWIN32`
`66`		`-#defineDIRSEPERATOR"/"`
	`74`	`+#defineDIRSEPARATOR"/"`
`67`	`75`	`#else`
`68`		`-#defineDIRSEPERATOR"\\"`
	`76`	`+#defineDIRSEPARATOR"\\"`
`69`	`77`	`#endif`
`70`	`78`
`71`	`79`	`voidremove_newlines(char*string);`

Comments

(0)